Changeset 78802 for trunk/boost/thread/xtime.hpp

Timestamp:

Jun 3, 2012, 6:11:52 PM (6 years ago)

Author:

viboes

Message:

Thread: fix TIME_UTC, WINVER, constexpr for tags, and don't use local files

File:

• trunk/boost/thread/xtime.hpp (modified) (6 diffs)

trunk/boost/thread/xtime.hpp

@@ -3 +3 @@
 // Copyright (C) 2007-8 Anthony Williams
 //
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -21 +21 @@
 enum xtime_clock_types
 {
-    TIME_UTC=1
+    TIME_UTC_=1
 //    TIME_TAI,
 //    TIME_MONOTONIC,
@@ -54 +54 @@
 #endif
     }
-    
+
 };
 
@@ -61 +61 @@
     xtime res;
     boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0);
-            
+
     res.sec=static_cast<xtime::xtime_sec_t>(time_since_epoch.total_seconds());
     res.nsec=static_cast<xtime::xtime_nsec_t>(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second()));
@@ -69 +69 @@
 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());
@@ -82 +82 @@
     if (xt1.sec == xt2.sec)
         return (int)(xt1.nsec - xt2.nsec);
-    else 
+    else
         return (xt1.sec > xt2.sec) ? 1 : -1;
 }