Imported Upstream version 1.57.0

[platform/upstream/boost.git] / libs / chrono / test / duration / constructor_pass.cpp

diff --git a/libs/chrono/test/duration/constructor_pass.cpp b/libs/chrono/test/duration/constructor_pass.cpp
index 9e63a41..b744e15 100644 (file)
--- a/libs/chrono/test/duration/constructor_pass.cpp
+++ b/libs/chrono/test/duration/constructor_pass.cpp
@@ -16,26 +16,38 @@
 #include <boost/detail/lightweight_test.hpp>
 
 
-#include <libs/chrono/test/rep.h>
+#include "../rep.h"
 #include <iostream>
 
+#ifdef BOOST_NO_CXX11_CONSTEXPR
+#define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
+#else
+#include <boost/static_assert.hpp>
+#define BOOST_CONSTEXPR_ASSERT(C) BOOST_STATIC_ASSERT(C)
+#endif
+
 template <class D>
 void
 check_default()
 {
-  //D d=D();
-  D d;
-  //std::cout << d.count() << std::endl;
-  //std::cout << typename D::rep() <<  std::endl;
+  {
+    D d;
     BOOST_TEST(d.count() == typename D::rep());
+  }
+  {
+    BOOST_CONSTEXPR D d;
+    BOOST_CONSTEXPR_ASSERT(d.count() == typename D::rep());
+  }
 }
 
 template <class D, class R>
 void
 check_from_rep(R r)
 {
+  {
     D d(r);
     BOOST_TEST(d.count() == r);
+  }
 }
 
 int main()
@@ -45,39 +57,71 @@ int main()
         boost::chrono::milliseconds ms(1);
         boost::chrono::microseconds us = ms;
         BOOST_TEST(us.count() == 1000);
+        {
+          BOOST_CONSTEXPR boost::chrono::milliseconds ms(1);
+          BOOST_CONSTEXPR boost::chrono::microseconds us = ms;
+          BOOST_CONSTEXPR_ASSERT(us.count() == 1000);
+        }
     }
     // inexact conversions allowed for floating point reps
     {
         boost::chrono::duration<double, boost::micro> us(1);
         boost::chrono::duration<double, boost::milli> ms = us;
         BOOST_TEST(ms.count() == 1./1000);
+        {
+          BOOST_CONSTEXPR boost::chrono::duration<double, boost::micro> us(1);
+          BOOST_CONSTEXPR boost::chrono::duration<double, boost::milli> ms = us;
+          BOOST_CONSTEXPR_ASSERT(ms.count() == 1./1000);
+        }
     }
     // Convert int to float
     {
         boost::chrono::duration<int> i(3);
-        boost::chrono::duration<int> d = i;
+        boost::chrono::duration<double> d = i;
         BOOST_TEST(d.count() == 3);
+        {
+          BOOST_CONSTEXPR boost::chrono::duration<int> i(3);
+          BOOST_CONSTEXPR boost::chrono::duration<double> d = i;
+          BOOST_CONSTEXPR_ASSERT(d.count() == 3);
+        }
     }
     // default constructor
     {
-        check_default<boost::chrono::duration<Rep> >();
-       // constexpr default constructor
-        BOOST_CONSTEXPR boost::chrono::duration<int> d;
+      check_default<boost::chrono::duration<Rep> >();
     }
     // constructor from rep
     {
-      check_from_rep<boost::chrono::duration<int> >(5);
-      BOOST_CONSTEXPR boost::chrono::duration<int> d(5);
+        check_from_rep<boost::chrono::duration<int> >(5);
+        {
+          BOOST_CONSTEXPR boost::chrono::duration<int> d(5);
+          BOOST_CONSTEXPR_ASSERT(d.count() == 5);
+        }
         check_from_rep<boost::chrono::duration<int, boost::ratio<3, 2> > >(5);
+        {
+          BOOST_CONSTEXPR boost::chrono::duration<int, boost::ratio<3, 2> > d(5);
+          BOOST_CONSTEXPR_ASSERT(d.count() == 5);
+        }
         check_from_rep<boost::chrono::duration<Rep, boost::ratio<3, 2> > >(Rep(3));
+        {
+          BOOST_CONSTEXPR boost::chrono::duration<Rep, boost::ratio<3, 2> > d(Rep(3));
+          BOOST_CONSTEXPR_ASSERT(d.count() == Rep(3));
+        }
         check_from_rep<boost::chrono::duration<double, boost::ratio<2, 3> > >(5.5);
-        boost::chrono::duration<double, boost::ratio<2, 3> > d2(5.5);
+        {
+          BOOST_CONSTEXPR boost::chrono::duration<double, boost::ratio<3, 2> > d(5.5);
+          BOOST_CONSTEXPR_ASSERT(d.count() == 5.5);
+        }
+
+
     }
     // constructor from other rep
     {
         boost::chrono::duration<double> d(5);
         BOOST_TEST(d.count() == 5);
-        return boost::report_errors();
+        {
+          BOOST_CONSTEXPR boost::chrono::duration<double> d(5);
+          BOOST_CONSTEXPR_ASSERT(d.count() == 5);
+        }
     }
 
     return boost::report_errors();