Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/SConscript | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/SConscript')
| -rw-r--r-- | 3rdParty/Boost/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript index a0d6500..200c2b4 100644 --- a/3rdParty/Boost/SConscript +++ b/3rdParty/Boost/SConscript @@ -53,6 +53,7 @@ elif env.get("BOOST_BUNDLED", False) : myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")]) sources = [ + "src/libs/atomic/src/lockpool.cpp", "src/libs/date_time/src/gregorian/date_generators.cpp", "src/libs/date_time/src/gregorian/greg_month.cpp", "src/libs/date_time/src/gregorian/greg_weekday.cpp", @@ -124,7 +125,6 @@ elif env.get("BOOST_BUNDLED", False) : "src/libs/serialization/src/extended_type_info_typeid.cpp", "src/libs/serialization/src/polymorphic_iarchive.cpp", "src/libs/serialization/src/polymorphic_oarchive.cpp", - "src/libs/serialization/src/shared_ptr_helper.cpp", "src/libs/serialization/src/stl_port.cpp", "src/libs/serialization/src/text_iarchive.cpp", "src/libs/serialization/src/text_oarchive.cpp", @@ -148,6 +148,7 @@ elif env.get("BOOST_BUNDLED", False) : if env["PLATFORM"] != "win32" : sources += [ "src/libs/thread/src/pthread/once.cpp", + "src/libs/thread/src/pthread/once_atomic.cpp", "src/libs/thread/src/pthread/thread.cpp"] else : sources += [ |