diff -Nurp boost_1_54_0/libs/thread/build/has_atomic_flag_lockfree_test.cpp boost_1_54_0.pm/libs/thread/build/has_atomic_flag_lockfree_test.cpp
old
|
new
|
|
| 1 | // Copyright (c) 2013, Petr Machata, Red Hat Inc. |
| 2 | // |
| 3 | // Use modification and distribution are subject to the boost Software |
| 4 | // License, Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). |
| 5 | |
| 6 | #include "../../../boost/atomic.hpp" |
| 7 | #include "../../../boost/static_assert.hpp" |
| 8 | |
| 9 | int |
| 10 | main(int argc, char *argv[]) |
| 11 | { |
| 12 | BOOST_STATIC_ASSERT(BOOST_ATOMIC_FLAG_LOCK_FREE); |
| 13 | return 0; |
| 14 | } |
diff -Nurp boost_1_54_0/libs/thread/build/Jamfile.v2 boost_1_54_0.pm/libs/thread/build/Jamfile.v2
old
|
new
|
import os ;
|
36 | 36 | import feature ; |
37 | 37 | import indirect ; |
38 | 38 | import path ; |
| 39 | import configure ; |
39 | 40 | |
40 | 41 | project boost/thread |
41 | 42 | : source-location ../src |
… |
… |
local rule default_threadapi ( )
|
140 | 141 | feature.feature threadapi : pthread win32 : propagated ; |
141 | 142 | feature.set-default threadapi : [ default_threadapi ] ; |
142 | 143 | |
| 144 | exe has_atomic_flag_lockfree : ../build/has_atomic_flag_lockfree_test.cpp ; |
| 145 | |
143 | 146 | rule tag ( name : type ? : property-set ) |
144 | 147 | { |
145 | 148 | local result = $(name) ; |
… |
… |
rule requirements ( properties * )
|
248 | 251 | { |
249 | 252 | local result ; |
250 | 253 | |
| 254 | if ! [ configure.builds has_atomic_flag_lockfree |
| 255 | : $(properties) : "lockfree boost::atomic_flag" ] |
| 256 | { |
| 257 | result += <library>/boost/atomic//boost_atomic ; |
| 258 | } |
| 259 | |
251 | 260 | if <threadapi>pthread in $(properties) |
252 | 261 | { |
253 | 262 | result += <define>BOOST_THREAD_POSIX ; |