From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 5 Feb 2016 16:22:55 +0000 (-0500)
Subject: time: Remove constexpr from non-literal type in test
X-Git-Tag: v10.0.4~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=672a694afc15b5c356dce72224d28c99a40d3a5f;p=ceph.git

time: Remove constexpr from non-literal type in test

This fixes a compile error under clang and fixes another FreeBSD porting
issue.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/test/common/test_time.cc b/src/test/common/test_time.cc
index e363085da33a..2e6ad4bbcbd2 100644
--- a/src/test/common/test_time.cc
+++ b/src/test/common/test_time.cc
@@ -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);