| --- a/boost/config/stdlib/libstdcpp3.hpp 2010-10-01 02:19:44.000000000 -0700 |
| +++ b/boost/config/stdlib/libstdcpp3.hpp 2014-05-31 04:07:43.998193374 -0700 |
| @@ -31,7 +31,8 @@ |
| |
| #ifdef __GLIBCXX__ // gcc 3.4 and greater: |
| # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ |
| - || defined(_GLIBCXX__PTHREADS) |
| + || defined(_GLIBCXX__PTHREADS) \ |
| + || defined(_GLIBCXX_HAS_GTHREADS) |
| // |
| // If the std lib has thread support turned on, then turn it on in Boost |
| // as well. We do this because some gcc-3.4 std lib headers define _REENTANT |
| --- a/boost/thread/xtime.hpp 2008-06-18 06:01:08.000000000 -0700 |
| +++ b/boost/thread/xtime.hpp 2014-05-31 04:07:44.098193379 -0700 |
| @@ -20,7 +20,7 @@ |
| |
| enum xtime_clock_types |
| { |
| - TIME_UTC=1 |
| + TIME_UTC_=1 |
| // TIME_TAI, |
| // TIME_MONOTONIC, |
| // TIME_PROCESS, |
| @@ -68,7 +68,7 @@ |
| |
| inline int xtime_get(struct xtime* xtp, int clock_type) |
| { |
| - if (clock_type == TIME_UTC) |
| + if (clock_type == TIME_UTC_) |
| { |
| *xtp=get_xtime(get_system_time()); |
| return clock_type; |
| --- a/libs/thread/src/pthread/thread.cpp 2010-10-29 16:27:00.000000000 -0700 |
| +++ b/libs/thread/src/pthread/thread.cpp 2014-05-31 04:07:50.302193645 -0700 |
| @@ -350,7 +350,7 @@ |
| cond.timed_wait(lock, xt); |
| # endif |
| xtime cur; |
| - xtime_get(&cur, TIME_UTC); |
| + xtime_get(&cur, TIME_UTC_); |
| if (xtime_cmp(xt, cur) <= 0) |
| return; |
| } |
| @@ -365,7 +365,7 @@ |
| BOOST_VERIFY(!pthread_yield()); |
| # else |
| xtime xt; |
| - xtime_get(&xt, TIME_UTC); |
| + xtime_get(&xt, TIME_UTC_); |
| sleep(xt); |
| # endif |
| } |
| --- a/libs/thread/src/pthread/timeconv.inl 2010-04-01 08:04:15.000000000 -0700 |
| +++ b/libs/thread/src/pthread/timeconv.inl 2014-05-31 04:07:50.302193645 -0700 |
| @@ -20,8 +20,8 @@ |
| 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 @@ |
| { |
| 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 @@ |
| { |
| 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 @@ |
| { |
| 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; |
| --- a/boost/static_assert.hpp 2008-07-11 03:49:31.000000000 -0700 |
| +++ b/boost/static_assert.hpp 2014-06-07 07:32:29.365107458 -0700 |
| @@ -38,6 +38,15 @@ |
| # define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x) |
| #endif |
| |
| +// |
| +// If the compiler warns about unused typedefs then enable this: |
| +// |
| +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) |
| +# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused)) |
| +#else |
| +# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE |
| +#endif |
| + |
| #ifdef BOOST_HAS_STATIC_ASSERT |
| # define BOOST_STATIC_ASSERT( B ) static_assert(B, #B) |
| #else |
| @@ -116,7 +125,7 @@ |
| #define BOOST_STATIC_ASSERT( B ) \ |
| typedef ::boost::static_assert_test<\ |
| sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >)>\ |
| - BOOST_JOIN(boost_static_assert_typedef_, __LINE__) |
| + BOOST_JOIN(boost_static_assert_typedef_, __LINE__) BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE |
| #endif |
| |
| #else |
| |