Subject: [Boost-commit] svn:boost r71218 - in branches/release/boost/chrono: . detail/inlined/win
From: vicente.botet_at_[hidden]
Date: 2011-04-12 16:42:09
Author: viboes
Date: 2011-04-12 16:42:08 EDT (Tue, 12 Apr 2011)
New Revision: 71218
URL: http://svn.boost.org/trac/boost/changeset/71218
Log:
Chrono: inspect update
Text files modified:
branches/release/boost/chrono/detail/inlined/win/chrono.hpp | 32 +++++++++++++++---------------
branches/release/boost/chrono/detail/inlined/win/process_clock.hpp | 10 ++++----
branches/release/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp | 42 ++++++++++++++++++++--------------------
branches/release/boost/chrono/duration.hpp | 2
4 files changed, 43 insertions(+), 43 deletions(-)
Modified: branches/release/boost/chrono/detail/inlined/win/chrono.hpp
==============================================================================
--- branches/release/boost/chrono/detail/inlined/win/chrono.hpp (original)
+++ branches/release/boost/chrono/detail/inlined/win/chrono.hpp 2011-04-12 16:42:08 EDT (Tue, 12 Apr 2011)
@@ -95,14 +95,14 @@
system_clock::time_point system_clock::now()
{
boost::detail::win32::FILETIME_ ft;
- #if defined(UNDER_CE)
- // Windows CE does not define GetSystemTimeAsFileTime so we do it in two steps.
- boost::detail::win32::SYSTEMTIME_ st;
- boost::detail::win32::GetSystemTime( &st );
- boost::detail::win32::SystemTimeToFileTime( &st, &ft );
- #else
- boost::detail::win32::GetSystemTimeAsFileTime( &ft ); // never fails
- #endif
+ #if defined(UNDER_CE)
+ // Windows CE does not define GetSystemTimeAsFileTime so we do it in two steps.
+ boost::detail::win32::SYSTEMTIME_ st;
+ boost::detail::win32::GetSystemTime( &st );
+ boost::detail::win32::SystemTimeToFileTime( &st, &ft );
+ #else
+ boost::detail::win32::GetSystemTimeAsFileTime( &ft ); // never fails
+ #endif
return system_clock::time_point(system_clock::duration(
(static_cast<__int64>( ft.dwHighDateTime ) << 32) | ft.dwLowDateTime));
}
@@ -111,14 +111,14 @@
system_clock::time_point system_clock::now( system::error_code & ec )
{
boost::detail::win32::FILETIME_ ft;
- #if defined(UNDER_CE)
- // Windows CE does not define GetSystemTimeAsFileTime so we do it in two steps.
- boost::detail::win32::SYSTEMTIME_ st;
- boost::detail::win32::GetSystemTime( &st );
- boost::detail::win32::SystemTimeToFileTime( &st, &ft );
- #else
- boost::detail::win32::GetSystemTimeAsFileTime( &ft ); // never fails
- #endif
+ #if defined(UNDER_CE)
+ // Windows CE does not define GetSystemTimeAsFileTime so we do it in two steps.
+ boost::detail::win32::SYSTEMTIME_ st;
+ boost::detail::win32::GetSystemTime( &st );
+ boost::detail::win32::SystemTimeToFileTime( &st, &ft );
+ #else
+ boost::detail::win32::GetSystemTimeAsFileTime( &ft ); // never fails
+ #endif
if (!BOOST_CHRONO_IS_THROWS(ec))
{
ec.clear();
Modified: branches/release/boost/chrono/detail/inlined/win/process_clock.hpp
==============================================================================
--- branches/release/boost/chrono/detail/inlined/win/process_clock.hpp (original)
+++ branches/release/boost/chrono/detail/inlined/win/process_clock.hpp 2011-04-12 16:42:08 EDT (Tue, 12 Apr 2011)
@@ -34,11 +34,11 @@
times_.real = duration( steady_clock::now().time_since_epoch().count() );
- #ifdef UNDER_CE
- // Windows CE does not support GetProcessTimes
+ #ifdef UNDER_CE
+ // Windows CE does not support GetProcessTimes
assert( 0 && "GetProcessTimes not supported under Windows CE" );
- times_.real = times_.system = times_.user = nanoseconds(-1);
- #else
+ times_.real = times_.system = times_.user = nanoseconds(-1);
+ #else
if ( boost::detail::win32::GetProcessTimes(
boost::detail::win32::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
@@ -72,7 +72,7 @@
times_.real = times_.system = times_.user = nanoseconds(-1);
}
}
- #endif
+ #endif
}
} // namespace chrono
} // namespace boost
Modified: branches/release/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp
==============================================================================
--- branches/release/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp (original)
+++ branches/release/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp 2011-04-12 16:42:08 EDT (Tue, 12 Apr 2011)
@@ -33,11 +33,11 @@
// note that Windows uses 100 nanosecond ticks for FILETIME
boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
- #ifdef UNDER_CE
- // Windows CE does not support GetProcessTimes
+ #ifdef UNDER_CE
+ // Windows CE does not support GetProcessTimes
assert( 0 && "GetProcessTimes not supported under Windows CE" );
- return time_point();
- #else
+ return time_point();
+ #else
if ( boost::detail::win32::GetProcessTimes(
boost::detail::win32::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
@@ -65,7 +65,7 @@
return time_point();
}
}
- #endif
+ #endif
}
process_user_cpu_clock::time_point process_user_cpu_clock::now(
@@ -75,11 +75,11 @@
// note that Windows uses 100 nanosecond ticks for FILETIME
boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
- #ifdef UNDER_CE
- // Windows CE does not support GetProcessTimes
+ #ifdef UNDER_CE
+ // Windows CE does not support GetProcessTimes
assert( 0 && "GetProcessTimes not supported under Windows CE" );
- return time_point();
- #else
+ return time_point();
+ #else
if ( boost::detail::win32::GetProcessTimes(
boost::detail::win32::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
@@ -110,7 +110,7 @@
return time_point();
}
}
- #endif
+ #endif
}
process_system_cpu_clock::time_point process_system_cpu_clock::now(
@@ -120,11 +120,11 @@
// note that Windows uses 100 nanosecond ticks for FILETIME
boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
- #ifdef UNDER_CE
- // Windows CE does not support GetProcessTimes
+ #ifdef UNDER_CE
+ // Windows CE does not support GetProcessTimes
assert( 0 && "GetProcessTimes not supported under Windows CE" );
- return time_point();
- #else
+ return time_point();
+ #else
if ( boost::detail::win32::GetProcessTimes(
boost::detail::win32::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
@@ -155,8 +155,8 @@
return time_point();
}
}
- #endif
-
+ #endif
+
}
process_cpu_clock::time_point process_cpu_clock::now(
system::error_code & ec )
@@ -165,11 +165,11 @@
// note that Windows uses 100 nanosecond ticks for FILETIME
boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
- #ifdef UNDER_CE
- // Windows CE does not support GetProcessTimes
+ #ifdef UNDER_CE
+ // Windows CE does not support GetProcessTimes
assert( 0 && "GetProcessTimes not supported under Windows CE" );
- return time_point();
- #else
+ return time_point();
+ #else
if ( boost::detail::win32::GetProcessTimes(
boost::detail::win32::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
@@ -206,7 +206,7 @@
return time_point();
}
}
- #endif
+ #endif
}
} // namespace chrono
Modified: branches/release/boost/chrono/duration.hpp
==============================================================================
--- branches/release/boost/chrono/duration.hpp (original)
+++ branches/release/boost/chrono/duration.hpp 2011-04-12 16:42:08 EDT (Tue, 12 Apr 2011)
@@ -446,7 +446,7 @@
>
>
>::type* = 0
- ) : rep_(r) { }
+ ) : rep_(r) { }
~duration() {} //= default;
duration(const duration& rhs) : rep_(rhs.rep_) {} // = default;
duration& operator=(const duration& rhs) // = default;