Subject: [Boost-commit] svn:boost r68158 - in trunk/libs/chrono: build test
From: vicente.botet_at_[hidden]
Date: 2011-01-14 12:44:06
Author: viboes
Date: 2011-01-14 12:44:05 EST (Fri, 14 Jan 2011)
New Revision: 68158
URL: http://svn.boost.org/trac/boost/changeset/68158
Log:
Boost.Chrono: Remove BOOST_USE_WINDOWS_H from the Jamfiles and move it to the config.h file when BOOST_CHRONO_SOURCE is defined
Text files modified:
trunk/libs/chrono/build/Jamfile.v2 | 1
trunk/libs/chrono/test/Jamfile.v2 | 66 +++++++--------------------------------
2 files changed, 13 insertions(+), 54 deletions(-)
Modified: trunk/libs/chrono/build/Jamfile.v2
==============================================================================
--- trunk/libs/chrono/build/Jamfile.v2 (original)
+++ trunk/libs/chrono/build/Jamfile.v2 2011-01-14 12:44:05 EST (Fri, 14 Jan 2011)
@@ -15,7 +15,6 @@
<threading>single:<define>BOOST_CHRONO_THREAD_DISABLED
<library>/boost/system//boost_system
#<define>BOOST_SYSTEM_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: trunk/libs/chrono/test/Jamfile.v2
==============================================================================
--- trunk/libs/chrono/test/Jamfile.v2 (original)
+++ trunk/libs/chrono/test/Jamfile.v2 2011-01-14 12:44:05 EST (Fri, 14 Jan 2011)
@@ -40,13 +40,14 @@
return
[ run $(sources) ../build//boost_chrono
: :
- : <define>BOOST_USE_WINDOWS_H
+ :
<library>/boost/system//boost_system
: $(sources[1]:B)_shared ]
[ run $(sources) ../build//boost_chrono/<link>static
: :
- : <define>BOOST_USE_WINDOWS_H <library>/boost/system//boost_system
- : $(sources[1]:B)_static ]
+ :
+ <library>/boost/system//boost_system
+ : $(sources[1]:B)_static ]
[ run $(sources)
: :
: <define>BOOST_CHRONO_INLINED
@@ -55,14 +56,6 @@
<library>/boost/system//boost_system
<os>LINUX:<threading>multi
: $(sources[1]:B)_header ]
-# [ run $(sources)
-# : :
-# : <define>BOOST_CHRONO_INLINED
-# <define>BOOST_USE_WINDOWS_H
-# # comment one of the following lines
-# #<define>BOOST_SYSTEM_INLINED
-# <library>/boost/system//boost_system
-# : $(sources[1]:B)_header_win ]
;
}
rule chrono-run2 ( sources : name )
@@ -70,12 +63,13 @@
return
[ run $(sources) ../build//boost_chrono
: :
- : <define>BOOST_USE_WINDOWS_H
+ :
<library>/boost/system//boost_system
: $(name)_shared ]
[ run $(sources) ../build//boost_chrono/<link>static
: :
- : <library>/boost/system//boost_system
+ :
+ <library>/boost/system//boost_system
: $(name)_static ]
[ run $(sources)
: :
@@ -85,14 +79,6 @@
<library>/boost/system//boost_system
<os>LINUX:<threading>multi
: $(name)_header ]
-# [ run $(sources)
-# : :
-# : <define>BOOST_CHRONO_INLINED
-# <define>BOOST_USE_WINDOWS_H
-# # comment one of the following lines
-# #<define>BOOST_SYSTEM_INLINED
-# <library>/boost/system//boost_system
-# : $(name)_header_win ]
;
}
@@ -102,13 +88,14 @@
return
[ run $(sources) ../build//boost_chrono
: :
- : <define>BOOST_USE_WINDOWS_H
+ :
<library>/boost/system//boost_system
<os>LINUX:<threading>multi
: $(sources[1]:B)_shared ]
[ run $(sources) ../build//boost_chrono/<link>static
: :
- : <define>BOOST_USE_WINDOWS_H <library>/boost/system//boost_system
+ :
+ <library>/boost/system//boost_system
<os>LINUX:<threading>multi
: $(sources[1]:B)_static ]
[ run $(sources)
@@ -119,14 +106,6 @@
<library>/boost/system//boost_system
<os>LINUX:<threading>multi
: $(sources[1]:B)_header ]
-# [ run $(sources)
-# : :
-# : <define>BOOST_CHRONO_INLINED
-# <define>BOOST_USE_WINDOWS_H
-# # comment one of the following lines
-# #<define>BOOST_SYSTEM_INLINED
-# <library>/boost/system//boost_system
-# : $(sources[1]:B)_header_win ]
;
}
rule chrono-run2-mt ( sources : name )
@@ -134,13 +113,14 @@
return
[ run $(sources) ../build//boost_chrono
: :
- : <define>BOOST_USE_WINDOWS_H
+ :
<library>/boost/system//boost_system
<os>LINUX:<threading>multi
: $(name)_shared ]
[ run $(sources) ../build//boost_chrono/<link>static
: :
- : <library>/boost/system//boost_system
+ :
+ <library>/boost/system//boost_system
<os>LINUX:<threading>multi
: $(name)_static ]
[ run $(sources)
@@ -151,14 +131,6 @@
<library>/boost/system//boost_system
<os>LINUX:<threading>multi
: $(name)_header ]
-# [ run $(sources)
-# : :
-# : <define>BOOST_CHRONO_INLINED
-# <define>BOOST_USE_WINDOWS_H
-# # comment one of the following lines
-# #<define>BOOST_SYSTEM_INLINED
-# <library>/boost/system//boost_system
-# : $(name)_header_win ]
;
}
rule chrono-compile ( sources )
@@ -172,12 +144,6 @@
# comment the following line
<define>BOOST_SYSTEM_INLINED
: $(sources[1]:B)_header ]
-# [ compile $(sources)
-# : <define>BOOST_CHRONO_INLINED
-# <define>BOOST_USE_WINDOWS_H
-# # comment the following line
-# <define>BOOST_SYSTEM_INLINED
-# : $(sources[1]:B)_header_win ]
;
}
@@ -192,12 +158,6 @@
# comment the following line
<define>BOOST_SYSTEM_INLINED
: $(name)_header ]
-# [ compile $(sources)
-# : <define>BOOST_CHRONO_INLINED
-# <define>BOOST_USE_WINDOWS_H
-# # comment the following line
-# <define>BOOST_SYSTEM_INLINED
-# : $(name)_header_win ]
;
}