Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r65992 - in sandbox/chrono/libs/chrono: build src test
From: vicente.botet_at_[hidden]
Date: 2010-10-15 14:08:43


Author: viboes
Date: 2010-10-15 14:08:42 EDT (Fri, 15 Oct 2010)
New Revision: 65992
URL: http://svn.boost.org/trac/boost/changeset/65992

Log:
Chrono:
* Add guards for header files
* Fix bug on run_timer.cpp

Text files modified:
   sandbox/chrono/libs/chrono/build/Jamfile.v2 | 2 ++
   sandbox/chrono/libs/chrono/src/run_timer.cpp | 2 +-
   sandbox/chrono/libs/chrono/test/Jamfile.v2 | 1 +
   3 files changed, 4 insertions(+), 1 deletions(-)

Modified: sandbox/chrono/libs/chrono/build/Jamfile.v2
==============================================================================
--- sandbox/chrono/libs/chrono/build/Jamfile.v2 (original)
+++ sandbox/chrono/libs/chrono/build/Jamfile.v2 2010-10-15 14:08:42 EDT (Fri, 15 Oct 2010)
@@ -25,6 +25,8 @@
         # uncomment the line above if you build outside the Boost release
         #<include>../../..
         <library>/boost/system//boost_system
+ #<define>BOOST_CHRONO_INLINED
+ <define>BOOST_USE_WINDOWS_H
         #<define>BOOST_COMMON_TYPE_USES_STATIC_ASSERT
         #<define>BOOST_RATIO_USES_STATIC_ASSERT
         #<define>BOOST_CHRONO_USES_STATIC_ASSERT

Modified: sandbox/chrono/libs/chrono/src/run_timer.cpp
==============================================================================
--- sandbox/chrono/libs/chrono/src/run_timer.cpp (original)
+++ sandbox/chrono/libs/chrono/src/run_timer.cpp 2010-10-15 14:08:42 EDT (Fri, 15 Oct 2010)
@@ -14,7 +14,7 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_CHRONO_SOURCE
 
-#include <boost/chrono/detail/inlined/run_timer_static.hpp>
+#include <boost/chrono/detail/inlined/run_timer.hpp>
 
 #if 0
 

Modified: sandbox/chrono/libs/chrono/test/Jamfile.v2
==============================================================================
--- sandbox/chrono/libs/chrono/test/Jamfile.v2 (original)
+++ sandbox/chrono/libs/chrono/test/Jamfile.v2 2010-10-15 14:08:42 EDT (Fri, 15 Oct 2010)
@@ -21,6 +21,7 @@
         <os>LINUX:<threading>multi
         #<library>/boost/chrono//boost_chrono
         <define>BOOST_CHRONO_INLINED
+ #<define>BOOST_USE_WINDOWS_H
         #<library>../build//boost_chrono
         <library>/boost/system//boost_system
         #<library>/boost/thread//boost_thread/<link>shared


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