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/src/boost/thread/xtime.hpp | |
| 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/src/boost/thread/xtime.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/thread/xtime.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/thread/xtime.hpp b/3rdParty/Boost/src/boost/thread/xtime.hpp index 1ca996f..9c6a359 100644 --- a/3rdParty/Boost/src/boost/thread/xtime.hpp +++ b/3rdParty/Boost/src/boost/thread/xtime.hpp @@ -9,6 +9,7 @@ #define BOOST_XTIME_WEK070601_HPP #include <boost/thread/detail/config.hpp> +#if defined BOOST_THREAD_USES_DATETIME #include <boost/cstdint.hpp> #include <boost/thread/thread_time.hpp> @@ -88,5 +89,5 @@ inline int xtime_cmp(const xtime& xt1, const xtime& xt2) } // namespace boost #include <boost/config/abi_suffix.hpp> - +#endif #endif //BOOST_XTIME_WEK070601_HPP |