From: Willem Jan Withagen <wjw@digiware.nl>
Date: Sat, 27 May 2017 16:36:08 +0000 (+0200)
Subject: common/iso_8601.cc: Make return expression Clang compatible
X-Git-Tag: v12.1.0~57^2~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50190741f18bdcd1cc0b5112d1ed80881164c3c0;p=ceph.git

common/iso_8601.cc: Make return expression Clang compatible

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/common/iso_8601.cc b/src/common/iso_8601.cc
index dcf43be94136..39e00e0b31f9 100644
--- a/src/common/iso_8601.cc
+++ b/src/common/iso_8601.cc
@@ -41,7 +41,8 @@ optional<real_time> calculate(const tm& t, uint32_t n = 0) {
     return none;
   }
 
-  return real_clock::from_time_t(tt) + nanoseconds(n);
+  return boost::make_optional<real_time>(real_clock::from_time_t(tt)
+                                         + nanoseconds(n));
 }
 }