From 38833e1f970840dcdd17f383472d265c5d1a18a4 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 18 Jul 2013 19:31:32 +0000 Subject: [PATCH] Replace TIME_UTC by TIME_UTC_ as suggested in bug report 64 (https://code.google.com/p/dealii/issues/detail?id=64#makechanges) and the linked to report at https://svn.boost.org/trac/boost/ticket/6940 . git-svn-id: https://svn.dealii.org/trunk@30046 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/boost-1.49.0/include/boost/thread/xtime.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deal.II/bundled/boost-1.49.0/include/boost/thread/xtime.hpp b/deal.II/bundled/boost-1.49.0/include/boost/thread/xtime.hpp index 7cc6272d6a..f908298647 100644 --- a/deal.II/bundled/boost-1.49.0/include/boost/thread/xtime.hpp +++ b/deal.II/bundled/boost-1.49.0/include/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, @@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_time const& abs_time) 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; -- 2.39.5