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]
This commit is contained in:
Jürgen Hunold
2012-06-20 06:50:46 +00:00
parent 71c8ee6e3c
commit 2829e75c44

View File

@@ -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;
}