Subject: [Boost-commit] svn:boost r65287 - in sandbox/chrono/libs/stopwatches: example test
From: vicente.botet_at_[hidden]
Date: 2010-09-05 06:45:57
Author: viboes
Date: 2010-09-05 06:45:55 EDT (Sun, 05 Sep 2010)
New Revision: 65287
URL: http://svn.boost.org/trac/boost/changeset/65287
Log:
Adapt to the fact Suspendible clocks are now on Stopwatches
Fix test minmax to be run only if GCC is not defined
Text files modified:
sandbox/chrono/libs/stopwatches/example/suspendible_stopclock_example.cpp | 2 +-
sandbox/chrono/libs/stopwatches/test/Jamfile.v2 | 10 +++++++++-
sandbox/chrono/libs/stopwatches/test/test_minmax.cpp | 3 +++
3 files changed, 13 insertions(+), 2 deletions(-)
Modified: sandbox/chrono/libs/stopwatches/example/suspendible_stopclock_example.cpp
==============================================================================
--- sandbox/chrono/libs/stopwatches/example/suspendible_stopclock_example.cpp (original)
+++ sandbox/chrono/libs/stopwatches/example/suspendible_stopclock_example.cpp 2010-09-05 06:45:55 EDT (Sun, 05 Sep 2010)
@@ -9,7 +9,7 @@
#include <boost/thread.hpp>
#include <boost/stopwatches/stopclock.hpp>
-#include <boost/chrono/suspendible_clock.hpp>
+#include <boost/stopwatches/suspendible_clock.hpp>
#include <cmath>
using namespace boost::chrono;
Modified: sandbox/chrono/libs/stopwatches/test/Jamfile.v2
==============================================================================
--- sandbox/chrono/libs/stopwatches/test/Jamfile.v2 (original)
+++ sandbox/chrono/libs/stopwatches/test/Jamfile.v2 2010-09-05 06:45:55 EDT (Sun, 05 Sep 2010)
@@ -36,7 +36,16 @@
<toolset>msvc:<cxxflags>/wd4127
;
+ test-suite "minmax"
+ :
+ [ compile test_minmax.cpp ]
+ ;
+ test-suite "other_clocks"
+ :
+ [ run test_suspendible_clock.cpp : : : <library>/boost/thread//boost_thread <link>static ]
+ [ run test_suspendible_clock.cpp : : : <library>/boost/thread//boost_thread : test_suspendible_clock_dll ]
+ ;
test-suite "stopwatch"
:
@@ -62,7 +71,6 @@
[ run ../example/scoped_stopclock_example.cpp : : : : function_stopclock_example_dll ]
[ link ../example/timex.cpp : <link>static ]
[ link ../example/timex.cpp : : timex_dll ]
- [ compile test_minmax.cpp ]
[ run stopclock_constructor_overload_test.cpp : : : <link>static ]
[ run stopclock_constructor_overload_test.cpp : : : : stopclock_constructor_overload_test_dll ]
[ run wstopclock_constructor_overload_test.cpp : : : <link>static ]
Modified: sandbox/chrono/libs/stopwatches/test/test_minmax.cpp
==============================================================================
--- sandbox/chrono/libs/stopwatches/test/test_minmax.cpp (original)
+++ sandbox/chrono/libs/stopwatches/test/test_minmax.cpp 2010-09-05 06:45:55 EDT (Sun, 05 Sep 2010)
@@ -6,6 +6,8 @@
// See http://www.boost.org/LICENSE_1_0.txt
+#if !defined(__GNUC__)
+
#define min(A,B) ((A)<(B)?(A):(B))
#define max(A,B) ((A)>(B)?(A):(B))
@@ -16,3 +18,4 @@
boost::stopwatches::stopclock<> _;
}
+#endif