]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
common/iso_8601.cc: Make return expression Clang compatible 15336/head
authorWillem Jan Withagen <wjw@digiware.nl>
Sat, 27 May 2017 16:36:08 +0000 (18:36 +0200)
committerWillem Jan Withagen <wjw@digiware.nl>
Sat, 27 May 2017 16:36:08 +0000 (18:36 +0200)
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
src/common/iso_8601.cc

index dcf43be9413658c11dbba2ca8e7498afac3129b5..39e00e0b31f9c648d79b54c7e94fbab56b83ca67 100644 (file)
@@ -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));
 }
 }