57 lines
3.7 KiB
Diff
57 lines
3.7 KiB
Diff
diff --git a/adobe/timer.hpp b/adobe/timer.hpp
|
|
index 8622e66..c0ef46d 100644
|
|
--- a/adobe/timer.hpp
|
|
+++ b/adobe/timer.hpp
|
|
@@ -182,7 +182,7 @@ public:
|
|
#if ADOBE_PLATFORM_WIN
|
|
(void)::QueryPerformanceCounter(&epoch_m);
|
|
#elif defined(BOOST_HAS_THREADS)
|
|
- boost::xtime_get(&epoch_m, boost::TIME_UTC);
|
|
+ boost::xtime_get(&epoch_m, boost::TIME_UTC_);
|
|
#elif defined(BOOST_HAS_GETTIMEOFDAY)
|
|
gettimeofday(&epoch_m, static_cast<struct timezone*>(0));
|
|
#endif
|
|
@@ -206,7 +206,7 @@ public:
|
|
(void)::QueryPerformanceCounter(&split_m);
|
|
return (split_m.QuadPart - epoch_m.QuadPart) / static_cast<double>(frequency_m.QuadPart) * double(1e3);
|
|
#elif defined(BOOST_HAS_THREADS)
|
|
- boost::xtime_get(&split_m, boost::TIME_UTC);
|
|
+ boost::xtime_get(&split_m, boost::TIME_UTC_);
|
|
return ((split_m.sec - epoch_m.sec) * double(1e3) + (split_m.nsec - epoch_m.nsec) / double(1e6));
|
|
#elif defined(BOOST_HAS_GETTIMEOFDAY)
|
|
gettimeofday(&split_m, static_cast<struct timezone*>(0));
|
|
diff --git a/documentation/html/timer_8hpp_source.html b/documentation/html/timer_8hpp_source.html
|
|
index d5fc808..79a7f62 100644
|
|
--- a/documentation/html/timer_8hpp_source.html
|
|
+++ b/documentation/html/timer_8hpp_source.html
|
|
@@ -200,7 +200,7 @@
|
|
<a name="l00182"></a>00182 <span class="preprocessor">#if ADOBE_PLATFORM_WIN</span>
|
|
<a name="l00183"></a>00183 <span class="preprocessor"></span> (void)::QueryPerformanceCounter(&epoch_m);
|
|
<a name="l00184"></a>00184 <span class="preprocessor">#elif defined(BOOST_HAS_THREADS)</span>
|
|
-<a name="l00185"></a>00185 <span class="preprocessor"></span> boost::xtime_get(&epoch_m, boost::TIME_UTC);
|
|
+<a name="l00185"></a>00185 <span class="preprocessor"></span> boost::xtime_get(&epoch_m, boost::TIME_UTC_);
|
|
<a name="l00186"></a>00186 <span class="preprocessor">#elif defined(BOOST_HAS_GETTIMEOFDAY)</span>
|
|
<a name="l00187"></a>00187 <span class="preprocessor"></span> gettimeofday(&epoch_m, static_cast<struct timezone*>(0));
|
|
<a name="l00188"></a>00188 <span class="preprocessor">#endif</span>
|
|
@@ -215,7 +215,7 @@
|
|
<a name="l00206"></a>00206 <span class="preprocessor"></span> (void)::QueryPerformanceCounter(&split_m);
|
|
<a name="l00207"></a>00207 <span class="keywordflow">return</span> (split_m.QuadPart - epoch_m.QuadPart) / <span class="keyword">static_cast<</span><span class="keywordtype">double</span><span class="keyword">></span>(frequency_m.QuadPart) * <span class="keywordtype">double</span>(1e3);
|
|
<a name="l00208"></a>00208 <span class="preprocessor">#elif defined(BOOST_HAS_THREADS)</span>
|
|
-<a name="l00209"></a>00209 <span class="preprocessor"></span> boost::xtime_get(&split_m, boost::TIME_UTC);
|
|
+<a name="l00209"></a>00209 <span class="preprocessor"></span> boost::xtime_get(&split_m, boost::TIME_UTC_);
|
|
<a name="l00210"></a>00210 <span class="keywordflow">return</span> ((split_m.sec - epoch_m.sec) * <span class="keywordtype">double</span>(1e3) + (split_m.nsec - epoch_m.nsec) / <span class="keywordtype">double</span>(1e6));
|
|
<a name="l00211"></a>00211 <span class="preprocessor">#elif defined(BOOST_HAS_GETTIMEOFDAY)</span>
|
|
<a name="l00212"></a>00212 <span class="preprocessor"></span> gettimeofday(&split_m, static_cast<struct timezone*>(0));
|
|
diff --git a/source/zuid_sys_dep.cpp b/source/zuid_sys_dep.cpp
|
|
index 8930dd7..bd54770 100644
|
|
--- a/source/zuid_sys_dep.cpp
|
|
+++ b/source/zuid_sys_dep.cpp
|
|
@@ -128,7 +128,7 @@ adobe::md5_t::digest_t get_generic_random_info()
|
|
#endif
|
|
{
|
|
#if defined(BOOST_HAS_THREADS)
|
|
- boost::xtime_get(&time_m, boost::TIME_UTC);
|
|
+ boost::xtime_get(&time_m, boost::TIME_UTC_);
|
|
#endif
|
|
#if defined(BOOST_HAS_UNISTD_H)
|
|
gethostname(hostname_m, 256);
|