diff --git a/Boost/boost/thread/xtime.hpp b/Boost/boost/thread/xtime.hpp index c05f1c76e..d1439e0da 100644 --- a/Boost/boost/thread/xtime.hpp +++ b/Boost/boost/thread/xtime.hpp @@ -20,7 +20,7 @@ namespace boost { enum xtime_clock_types { - TIME_UTC_=1 + TIME_UTC=1 // TIME_TAI, // TIME_MONOTONIC, // TIME_PROCESS, diff --git a/Boost/lib/pthread/timeconv.inl b/Boost/lib/pthread/timeconv.inl index 7c07802cc..b75a1353b 100644 --- a/Boost/lib/pthread/timeconv.inl +++ b/Boost/lib/pthread/timeconv.inl @@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = 1000; inline void to_time(int milliseconds, boost::xtime& xt) { int res = 0; - res = boost::xtime_get(&xt, boost::TIME_UTC_); - BOOST_ASSERT(res == boost::TIME_UTC_); + res = boost::xtime_get(&xt, boost::TIME_UTC); + BOOST_ASSERT(res == boost::TIME_UTC); xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * @@ -57,8 +57,8 @@ inline void to_timespec_duration(const boost::xtime& xt, timespec& ts) { boost::xtime cur; int res = 0; - res = boost::xtime_get(&cur, boost::TIME_UTC_); - BOOST_ASSERT(res == boost::TIME_UTC_); + res = boost::xtime_get(&cur, boost::TIME_UTC); + BOOST_ASSERT(res == boost::TIME_UTC); if (boost::xtime_cmp(xt, cur) <= 0) { @@ -88,8 +88,8 @@ inline void to_duration(boost::xtime xt, int& milliseconds) { boost::xtime cur; int res = 0; - res = boost::xtime_get(&cur, boost::TIME_UTC_); - BOOST_ASSERT(res == boost::TIME_UTC_); + res = boost::xtime_get(&cur, boost::TIME_UTC); + BOOST_ASSERT(res == boost::TIME_UTC); if (boost::xtime_cmp(xt, cur) <= 0) milliseconds = 0; @@ -110,8 +110,8 @@ inline void to_microduration(boost::xtime xt, int& microseconds) { boost::xtime cur; int res = 0; - res = boost::xtime_get(&cur, boost::TIME_UTC_); - BOOST_ASSERT(res == boost::TIME_UTC_); + res = boost::xtime_get(&cur, boost::TIME_UTC); + BOOST_ASSERT(res == boost::TIME_UTC); if (boost::xtime_cmp(xt, cur) <= 0) microseconds = 0;