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-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-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 @@ -1,46 +1,47 @@ // Copyright (C) 2001-2003 // William E. Kempf // Copyright (C) 2007-8 Anthony Williams // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #ifndef BOOST_XTIME_WEK070601_HPP #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> #include <boost/date_time/posix_time/conversion.hpp> #include <boost/config/abi_prefix.hpp> namespace boost { enum xtime_clock_types { TIME_UTC_=1 // TIME_TAI, // TIME_MONOTONIC, // TIME_PROCESS, // TIME_THREAD, // TIME_LOCAL, // TIME_SYNC, // TIME_RESOLUTION }; struct xtime { #if defined(BOOST_NO_INT64_T) typedef int_fast32_t xtime_sec_t; //INT_FAST32_MIN <= sec <= INT_FAST32_MAX #else typedef int_fast64_t xtime_sec_t; //INT_FAST64_MIN <= sec <= INT_FAST64_MAX #endif typedef int_fast32_t xtime_nsec_t; //0 <= xtime.nsec < NANOSECONDS_PER_SECOND xtime_sec_t sec; xtime_nsec_t nsec; operator system_time() const @@ -56,37 +57,37 @@ struct xtime }; inline xtime get_xtime(boost::system_time const& abs_time) { xtime res; boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0); res.sec=static_cast<xtime::xtime_sec_t>(time_since_epoch.total_seconds()); res.nsec=static_cast<xtime::xtime_nsec_t>(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second())); return res; } inline int xtime_get(struct xtime* xtp, int clock_type) { if (clock_type == TIME_UTC_) { *xtp=get_xtime(get_system_time()); return clock_type; } return 0; } inline int xtime_cmp(const xtime& xt1, const xtime& xt2) { if (xt1.sec == xt2.sec) return (int)(xt1.nsec - xt2.nsec); else return (xt1.sec > xt2.sec) ? 1 : -1; } } // namespace boost #include <boost/config/abi_suffix.hpp> - +#endif #endif //BOOST_XTIME_WEK070601_HPP |