Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r82018 - in branches/release/libs/chrono: build example src test test/clock test/duration test/time_point test/traits
From: vicente.botet_at_[hidden]
Date: 2012-12-16 06:16:01


Author: viboes
Date: 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
New Revision: 82018
URL: http://svn.boost.org/trac/boost/changeset/82018

Log:
Chrono: merge 81560
Properties modified:
   branches/release/libs/chrono/example/ (props changed)
   branches/release/libs/chrono/src/ (props changed)
   branches/release/libs/chrono/test/clock/ (props changed)
   branches/release/libs/chrono/test/duration/ (props changed)
   branches/release/libs/chrono/test/time_point/ (props changed)
   branches/release/libs/chrono/test/traits/ (props changed)
   branches/release/libs/chrono/test/win32_test.cpp (contents, props changed)
Text files modified:
   branches/release/libs/chrono/build/Jamfile.v2 | 2 ++
   branches/release/libs/chrono/example/test_clock.cpp | 2 +-
   branches/release/libs/chrono/test/Jamfile.v2 | 1 +
   branches/release/libs/chrono/test/clock/clock_pass.cpp | 2 +-
   branches/release/libs/chrono/test/duration/arithmetic_pass.cpp | 2 +-
   branches/release/libs/chrono/test/duration/comparisons_pass.cpp | 2 +-
   branches/release/libs/chrono/test/duration/constructor_pass.cpp | 2 +-
   branches/release/libs/chrono/test/duration/default_ratio_pass.cpp | 2 +-
   branches/release/libs/chrono/test/duration/duration_cast_pass.cpp | 6 +++---
   branches/release/libs/chrono/test/duration/typedefs_pass.cpp | 2 +-
   branches/release/libs/chrono/test/duration/types_pass.cpp | 2 +-
   branches/release/libs/chrono/test/time_point/arithmetic_ext_pass.cpp | 2 +-
   branches/release/libs/chrono/test/time_point/arithmetic_pass.cpp | 2 +-
   branches/release/libs/chrono/test/time_point/comparisons_pass.cpp | 2 +-
   branches/release/libs/chrono/test/time_point/constructor_pass.cpp | 2 +-
   branches/release/libs/chrono/test/time_point/default_duration.pass.cpp | 2 +-
   branches/release/libs/chrono/test/time_point/default_duration_pass.cpp | 2 +-
   branches/release/libs/chrono/test/time_point/time_point_cast_pass.cpp | 6 +++---
   branches/release/libs/chrono/test/traits/common_type_duration_pass.cpp | 2 +-
   branches/release/libs/chrono/test/traits/common_type_time_point_pass.cpp | 2 +-
   branches/release/libs/chrono/test/traits/treat_as_floating_point_pass.cpp | 2 +-
   branches/release/libs/chrono/test/win32_test.cpp | 2 +-
   22 files changed, 27 insertions(+), 24 deletions(-)

Modified: branches/release/libs/chrono/build/Jamfile.v2
==============================================================================
--- branches/release/libs/chrono/build/Jamfile.v2 (original)
+++ branches/release/libs/chrono/build/Jamfile.v2 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -52,6 +52,8 @@
         <toolset>gcc-mingw-4.6.3:<cxxflags>-fdiagnostics-show-option
         <toolset>gcc-mingw-4.7.0:<cxxflags>-fdiagnostics-show-option
         <toolset>gcc-mingw-4.8.0:<cxxflags>-fdiagnostics-show-option
+ <toolset>msvc:<cxxflags>/wd4512
+
 # Note: Some of the remarks from the Intel compiler are disabled
 # remark #193: zero used for undefined preprocessing identifier "XXX"
 # remark #304: access control not specified ("public" by default)

Modified: branches/release/libs/chrono/example/test_clock.cpp
==============================================================================
--- branches/release/libs/chrono/example/test_clock.cpp (original)
+++ branches/release/libs/chrono/example/test_clock.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -33,7 +33,7 @@
 
 #include "clock_name.hpp"
 
-#if defined(BOOST_NO_CONSTEXPR)
+#if defined(BOOST_NO_CXX11_CONSTEXPR)
 
 using namespace boost::chrono;
 

Modified: branches/release/libs/chrono/test/Jamfile.v2
==============================================================================
--- branches/release/libs/chrono/test/Jamfile.v2 (original)
+++ branches/release/libs/chrono/test/Jamfile.v2 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -40,6 +40,7 @@
         <toolset>gcc-mingw-4.5.0:<cxxflags>-Wno-missing-field-initializers
         <toolset>gcc-mingw-4.5.0:<cxxflags>-fdiagnostics-show-option
         <toolset>msvc:<cxxflags>/wd4127
+ <toolset>msvc:<cxxflags>/wd4512
 # Note: Some of the remarks from the Intel compiler are disabled
 # remark #193: zero used for undefined preprocessing identifier "XXX"
 # remark #304: access control not specified ("public" by default)

Modified: branches/release/libs/chrono/test/clock/clock_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/clock/clock_pass.cpp (original)
+++ branches/release/libs/chrono/test/clock/clock_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -18,7 +18,7 @@
 #include <boost/system/system_error.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/duration/arithmetic_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/duration/arithmetic_pass.cpp (original)
+++ branches/release/libs/chrono/test/duration/arithmetic_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -14,7 +14,7 @@
 #include <boost/chrono/duration.hpp>
 
 #include <boost/detail/lightweight_test.hpp>
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>

Modified: branches/release/libs/chrono/test/duration/comparisons_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/duration/comparisons_pass.cpp (original)
+++ branches/release/libs/chrono/test/duration/comparisons_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -13,7 +13,7 @@
 
 #include <boost/chrono/duration.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>

Modified: branches/release/libs/chrono/test/duration/constructor_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/duration/constructor_pass.cpp (original)
+++ branches/release/libs/chrono/test/duration/constructor_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -19,7 +19,7 @@
 #include "../rep.h"
 #include <iostream>
 
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>

Modified: branches/release/libs/chrono/test/duration/default_ratio_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/duration/default_ratio_pass.cpp (original)
+++ branches/release/libs/chrono/test/duration/default_ratio_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -19,7 +19,7 @@
 
 #include <boost/chrono/duration.hpp>
 #include <boost/type_traits.hpp>
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/duration/duration_cast_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/duration/duration_cast_pass.cpp (original)
+++ branches/release/libs/chrono/test/duration/duration_cast_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -14,11 +14,11 @@
 #include <boost/chrono/duration.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>
@@ -30,7 +30,7 @@
 void
 test(const FromDuration& f, const ToDuration& d)
 {
-//~ #if defined(BOOST_NO_DECLTYPE)
+//~ #if defined(BOOST_NO_CXX11_DECLTYPE)
     //~ typedef BOOST_TYPEOF_TPL(boost::chrono::duration_cast<ToDuration>(f)) R;
 //~ #else
     //~ typedef decltype(boost::chrono::duration_cast<ToDuration>(f)) R;

Modified: branches/release/libs/chrono/test/duration/typedefs_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/duration/typedefs_pass.cpp (original)
+++ branches/release/libs/chrono/test/duration/typedefs_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -16,7 +16,7 @@
 #include <boost/type_traits.hpp>
 #include <limits>
 
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/duration/types_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/duration/types_pass.cpp (original)
+++ branches/release/libs/chrono/test/duration/types_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -19,7 +19,7 @@
 
 #include <boost/chrono/duration.hpp>
 #include <boost/type_traits.hpp>
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/time_point/arithmetic_ext_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/time_point/arithmetic_ext_pass.cpp (original)
+++ branches/release/libs/chrono/test/time_point/arithmetic_ext_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -14,7 +14,7 @@
 #define BOOST_CHRONO_EXTENSIONS
 #include <boost/chrono/chrono.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>

Modified: branches/release/libs/chrono/test/time_point/arithmetic_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/time_point/arithmetic_pass.cpp (original)
+++ branches/release/libs/chrono/test/time_point/arithmetic_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -13,7 +13,7 @@
 
 #include <boost/chrono/chrono.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>

Modified: branches/release/libs/chrono/test/time_point/comparisons_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/time_point/comparisons_pass.cpp (original)
+++ branches/release/libs/chrono/test/time_point/comparisons_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -13,7 +13,7 @@
 
 #include <boost/chrono/chrono.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>

Modified: branches/release/libs/chrono/test/time_point/constructor_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/time_point/constructor_pass.cpp (original)
+++ branches/release/libs/chrono/test/time_point/constructor_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -14,7 +14,7 @@
 #include <boost/chrono/chrono.hpp>
 #include <boost/detail/lightweight_test.hpp>
 #include "../rep.h"
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>

Modified: branches/release/libs/chrono/test/time_point/default_duration.pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/time_point/default_duration.pass.cpp (original)
+++ branches/release/libs/chrono/test/time_point/default_duration.pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -13,7 +13,7 @@
 
 #include <boost/chrono/chrono.hpp>
 #include <boost/type_traits.hpp>
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/time_point/default_duration_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/time_point/default_duration_pass.cpp (original)
+++ branches/release/libs/chrono/test/time_point/default_duration_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -13,7 +13,7 @@
 
 #include <boost/chrono/chrono.hpp>
 #include <boost/type_traits.hpp>
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/time_point/time_point_cast_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/time_point/time_point_cast_pass.cpp (original)
+++ branches/release/libs/chrono/test/time_point/time_point_cast_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -15,10 +15,10 @@
 #include <boost/type_traits.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
-#ifdef BOOST_NO_CONSTEXPR
+#ifdef BOOST_NO_CXX11_CONSTEXPR
 #define BOOST_CONSTEXPR_ASSERT(C) BOOST_TEST(C)
 #else
 #include <boost/static_assert.hpp>
@@ -34,7 +34,7 @@
     typedef boost::chrono::time_point<Clock, ToDuration> ToTimePoint;
     FromTimePoint f(df);
     ToTimePoint t(d);
-//~ #if defined(BOOST_NO_DECLTYPE)
+//~ #if defined(BOOST_NO_CXX11_DECLTYPE)
     //~ typedef BOOST_TYPEOF_TPL(boost::chrono::time_point_cast<ToDuration>(f)) R;
 //~ #else
     //~ typedef decltype(boost::chrono::time_point_cast<ToDuration>(f)) R;

Modified: branches/release/libs/chrono/test/traits/common_type_duration_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/traits/common_type_duration_pass.cpp (original)
+++ branches/release/libs/chrono/test/traits/common_type_duration_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -14,7 +14,7 @@
 #include <boost/chrono/chrono.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/traits/common_type_time_point_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/traits/common_type_time_point_pass.cpp (original)
+++ branches/release/libs/chrono/test/traits/common_type_time_point_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -14,7 +14,7 @@
 #include <boost/chrono/chrono.hpp>
 #include <boost/type_traits.hpp>
 
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/traits/treat_as_floating_point_pass.cpp
==============================================================================
--- branches/release/libs/chrono/test/traits/treat_as_floating_point_pass.cpp (original)
+++ branches/release/libs/chrono/test/traits/treat_as_floating_point_pass.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -14,7 +14,7 @@
 #include <boost/chrono/chrono.hpp>
 #include <boost/type_traits.hpp>
 
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 

Modified: branches/release/libs/chrono/test/win32_test.cpp
==============================================================================
--- branches/release/libs/chrono/test/win32_test.cpp (original)
+++ branches/release/libs/chrono/test/win32_test.cpp 2012-12-16 06:15:58 EST (Sun, 16 Dec 2012)
@@ -11,7 +11,7 @@
 #if defined(BOOST_CHRONO_WINDOWS_API) || defined(__CYGWIN__)
 
 #include <boost/chrono/detail/static_assert.hpp>
-#if !defined(BOOST_NO_STATIC_ASSERT)
+#if !defined(BOOST_NO_CXX11_STATIC_ASSERT)
 #define NOTHING ""
 #endif
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk