From 2829e75c4421d8b7d9bab63303c8075860030083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hunold?= Date: Wed, 20 Jun 2012 06:50:46 +0000 Subject: [PATCH] Merge 78972 from ^/trunk ------------------------------------------------------------------------ r78972 | jhunold | 2012-06-16 14:05:44 +0200 (Sa, 16 Jun 2012) | 3 lines Fix regressions introduced in r78802. Reference #6940. Rename TIME_UTC to TIME_UTC_ ------------------------------------------------------------------------ [SVN r79015] --- test/util.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/util.hpp b/test/util.hpp index 9bfe1af..639c17b 100644 --- a/test/util.hpp +++ b/test/util.hpp @@ -71,7 +71,7 @@ inline bool in_range(const boost::posix_time::ptime& xt, int secs=1) boost::xtime xsecs(int secs) { boost::xtime ret; - boost::xtime_get(&ret, boost::TIME_UTC); + boost::xtime_get(&ret, boost::TIME_UTC_); ret.sec += secs; return ret; }