]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
time: Remove constexpr from non-literal type in test 7466/head
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 5 Feb 2016 16:22:55 +0000 (11:22 -0500)
committerAdam C. Emerson <aemerson@redhat.com>
Fri, 5 Feb 2016 16:22:55 +0000 (11:22 -0500)
This fixes a compile error under clang and fixes another FreeBSD porting
issue.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/test/common/test_time.cc

index e363085da33addbf2ac64318d7896865ce9e0302..2e6ad4bbcbd2bdc4c9d8bebcd6d3834ce51bb61e 100644 (file)
@@ -56,8 +56,7 @@ static constexpr double bd = bs + ((double)bns / 1000000000.);
 
 template<typename Clock>
 static void system_clock_sanity() {
-  static constexpr typename Clock::time_point brt(seconds(bs)
-                                                 + nanoseconds(bns));
+  static const typename Clock::time_point brt(seconds(bs) + nanoseconds(bns));
   const typename Clock::time_point now(Clock::now());
 
   ASSERT_GT(now, brt);