From b89fd36188c9941f0b8353044c7fdf82450df946 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 19 Jul 2013 07:40:42 +0000 Subject: [PATCH] Resolve a compilation issue with bundled boost compiled with clang or icc git-svn-id: https://svn.dealii.org/trunk@30054 0785d39b-7218-0410-832d-ea1e28bc413d --- .../libs/thread/example/starvephil.cpp | 6 +++--- .../boost-1.49.0/libs/thread/example/tennis.cpp | 2 +- .../boost-1.49.0/libs/thread/example/thread.cpp | 2 +- .../boost-1.49.0/libs/thread/example/xtime.cpp | 2 +- .../libs/thread/src/pthread/thread.cpp | 4 ++-- .../libs/thread/src/pthread/timeconv.inl | 16 ++++++++-------- .../libs/thread/src/win32/timeconv.inl | 16 ++++++++-------- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/deal.II/bundled/boost-1.49.0/libs/thread/example/starvephil.cpp b/deal.II/bundled/boost-1.49.0/libs/thread/example/starvephil.cpp index 0ef2e0d32d..b37c503498 100644 --- a/deal.II/bundled/boost-1.49.0/libs/thread/example/starvephil.cpp +++ b/deal.II/bundled/boost-1.49.0/libs/thread/example/starvephil.cpp @@ -50,7 +50,7 @@ public: << "very hot ..." << std::endl; } boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); xt.sec += 3; boost::thread::sleep(xt); m_chickens += value; @@ -85,7 +85,7 @@ void chef() std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl; } boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); xt.sec += 2; boost::thread::sleep(xt); { @@ -111,7 +111,7 @@ struct phil if (m_id > 0) { boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); xt.sec += 3; boost::thread::sleep(xt); } diff --git a/deal.II/bundled/boost-1.49.0/libs/thread/example/tennis.cpp b/deal.II/bundled/boost-1.49.0/libs/thread/example/tennis.cpp index 798f55e5d8..621d0891ce 100644 --- a/deal.II/bundled/boost-1.49.0/libs/thread/example/tennis.cpp +++ b/deal.II/bundled/boost-1.49.0/libs/thread/example/tennis.cpp @@ -104,7 +104,7 @@ int main(int argc, char* argv[]) boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B)); boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); xt.sec += 1; boost::thread::sleep(xt); { diff --git a/deal.II/bundled/boost-1.49.0/libs/thread/example/thread.cpp b/deal.II/bundled/boost-1.49.0/libs/thread/example/thread.cpp index c21a3b5ea8..09aa05a0cd 100644 --- a/deal.II/bundled/boost-1.49.0/libs/thread/example/thread.cpp +++ b/deal.II/bundled/boost-1.49.0/libs/thread/example/thread.cpp @@ -14,7 +14,7 @@ struct thread_alarm void operator()() { boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); xt.sec += m_secs; boost::thread::sleep(xt); diff --git a/deal.II/bundled/boost-1.49.0/libs/thread/example/xtime.cpp b/deal.II/bundled/boost-1.49.0/libs/thread/example/xtime.cpp index a9b1933908..0c4fb7150d 100644 --- a/deal.II/bundled/boost-1.49.0/libs/thread/example/xtime.cpp +++ b/deal.II/bundled/boost-1.49.0/libs/thread/example/xtime.cpp @@ -10,7 +10,7 @@ int main(int argc, char* argv[]) { boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); xt.sec += 1; boost::thread::sleep(xt); // Sleep for 1 second } diff --git a/deal.II/bundled/boost-1.49.0/libs/thread/src/pthread/thread.cpp b/deal.II/bundled/boost-1.49.0/libs/thread/src/pthread/thread.cpp index 07b8458bce..847662b90f 100644 --- a/deal.II/bundled/boost-1.49.0/libs/thread/src/pthread/thread.cpp +++ b/deal.II/bundled/boost-1.49.0/libs/thread/src/pthread/thread.cpp @@ -354,7 +354,7 @@ namespace boost 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; } @@ -369,7 +369,7 @@ namespace boost BOOST_VERIFY(!pthread_yield()); # else xtime xt; - xtime_get(&xt, TIME_UTC); + xtime_get(&xt, TIME_UTC_); sleep(xt); # endif } diff --git a/deal.II/bundled/boost-1.49.0/libs/thread/src/pthread/timeconv.inl b/deal.II/bundled/boost-1.49.0/libs/thread/src/pthread/timeconv.inl index 1c0a0cdca8..cab7c55a78 100644 --- a/deal.II/bundled/boost-1.49.0/libs/thread/src/pthread/timeconv.inl +++ b/deal.II/bundled/boost-1.49.0/libs/thread/src/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); (void)res; + res = boost::xtime_get(&xt, boost::TIME_UTC_); + BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * @@ -56,8 +56,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); (void)res; + res = boost::xtime_get(&cur, boost::TIME_UTC_); + BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; if (boost::xtime_cmp(xt, cur) <= 0) { @@ -87,8 +87,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); (void)res; + res = boost::xtime_get(&cur, boost::TIME_UTC_); + BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; if (boost::xtime_cmp(xt, cur) <= 0) milliseconds = 0; @@ -109,8 +109,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); (void)res; + res = boost::xtime_get(&cur, boost::TIME_UTC_); + BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; if (boost::xtime_cmp(xt, cur) <= 0) microseconds = 0; diff --git a/deal.II/bundled/boost-1.49.0/libs/thread/src/win32/timeconv.inl b/deal.II/bundled/boost-1.49.0/libs/thread/src/win32/timeconv.inl index 5ec3b1798a..c6467832a7 100644 --- a/deal.II/bundled/boost-1.49.0/libs/thread/src/win32/timeconv.inl +++ b/deal.II/bundled/boost-1.49.0/libs/thread/src/win32/timeconv.inl @@ -17,8 +17,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); - assert(res == boost::TIME_UTC); + res = boost::xtime_get(&xt, boost::TIME_UTC_); + assert(res == boost::TIME_UTC_); xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * @@ -54,8 +54,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); - assert(res == boost::TIME_UTC); + res = boost::xtime_get(&cur, boost::TIME_UTC_); + assert(res == boost::TIME_UTC_); if (boost::xtime_cmp(xt, cur) <= 0) { @@ -85,8 +85,8 @@ inline void to_duration(boost::xtime xt, int& milliseconds) { boost::xtime cur; int res = 0; - res = boost::xtime_get(&cur, boost::TIME_UTC); - assert(res == boost::TIME_UTC); + res = boost::xtime_get(&cur, boost::TIME_UTC_); + assert(res == boost::TIME_UTC_); if (boost::xtime_cmp(xt, cur) <= 0) milliseconds = 0; @@ -107,8 +107,8 @@ inline void to_microduration(boost::xtime xt, int& microseconds) { boost::xtime cur; int res = 0; - res = boost::xtime_get(&cur, boost::TIME_UTC); - assert(res == boost::TIME_UTC); + res = boost::xtime_get(&cur, boost::TIME_UTC_); + assert(res == boost::TIME_UTC_); if (boost::xtime_cmp(xt, cur) <= 0) microseconds = 0; -- 2.39.5