|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85818 - in branches/release: boost/chrono/detail/inlined/win boost/detail/win boost/detail/winapi boost/thread/win32 libs/chrono/test
From: andrey.semashev_at_[hidden]
Date: 2013-09-22 05:57:15
Author: andysem
Date: 2013-09-22 05:57:15 EDT (Sun, 22 Sep 2013)
New Revision: 85818
URL: http://svn.boost.org/trac/boost/changeset/85818
Log:
Merged changes from trunk.
Added:
branches/release/boost/detail/winapi/ (props changed)
- copied from r85817, trunk/boost/detail/winapi/
Deleted:
branches/release/boost/detail/win/
Text files modified:
branches/release/boost/chrono/detail/inlined/win/chrono.hpp | 46 ++++++------------
branches/release/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp | 48 ++++++++++----------
branches/release/boost/chrono/detail/inlined/win/thread_clock.hpp | 22 ++++----
branches/release/boost/thread/win32/thread_primitives.hpp | 2
branches/release/libs/chrono/test/Jamfile.v2 | 20 ++++----
branches/release/libs/chrono/test/win32_test.cpp | 96 ++++++++++++++++++++--------------------
6 files changed, 109 insertions(+), 125 deletions(-)
Modified: branches/release/boost/chrono/detail/inlined/win/chrono.hpp
==============================================================================
--- branches/release/boost/chrono/detail/inlined/win/chrono.hpp Sun Sep 22 05:12:38 2013 (r85817)
+++ branches/release/boost/chrono/detail/inlined/win/chrono.hpp 2013-09-22 05:57:15 EDT (Sun, 22 Sep 2013) (r85818)
@@ -12,9 +12,9 @@
#ifndef BOOST_CHRONO_DETAIL_INLINED_WIN_CHRONO_HPP
#define BOOST_CHRONO_DETAIL_INLINED_WIN_CHRONO_HPP
-#include <boost/detail/win/time.hpp>
-#include <boost/detail/win/timers.hpp>
-#include <boost/detail/win/GetLastError.hpp>
+#include <boost/detail/winapi/time.hpp>
+#include <boost/detail/winapi/timers.hpp>
+#include <boost/detail/winapi/GetLastError.hpp>
namespace boost
{
@@ -25,8 +25,8 @@
BOOST_CHRONO_INLINE double get_nanosecs_per_tic() BOOST_NOEXCEPT
{
- boost::detail::win32::LARGE_INTEGER_ freq;
- if ( !boost::detail::win32::QueryPerformanceFrequency( &freq ) )
+ boost::detail::winapi::LARGE_INTEGER_ freq;
+ if ( !boost::detail::winapi::QueryPerformanceFrequency( &freq ) )
return 0.0L;
return double(1000000000.0L / freq.QuadPart);
}
@@ -37,9 +37,9 @@
{
static double nanosecs_per_tic = chrono_detail::get_nanosecs_per_tic();
- boost::detail::win32::LARGE_INTEGER_ pcount;
+ boost::detail::winapi::LARGE_INTEGER_ pcount;
if ( (nanosecs_per_tic <= 0.0L) ||
- (!boost::detail::win32::QueryPerformanceCounter( &pcount )) )
+ (!boost::detail::winapi::QueryPerformanceCounter( &pcount )) )
{
BOOST_ASSERT(0 && "Boost::Chrono - Internal Error");
return steady_clock::time_point();
@@ -55,14 +55,14 @@
{
static double nanosecs_per_tic = chrono_detail::get_nanosecs_per_tic();
- boost::detail::win32::LARGE_INTEGER_ pcount;
+ boost::detail::winapi::LARGE_INTEGER_ pcount;
if ( (nanosecs_per_tic <= 0.0L)
- || (!boost::detail::win32::QueryPerformanceCounter( &pcount )) )
+ || (!boost::detail::winapi::QueryPerformanceCounter( &pcount )) )
{
- boost::detail::win32::DWORD_ cause =
+ boost::detail::winapi::DWORD_ cause =
((nanosecs_per_tic <= 0.0L)
? ERROR_NOT_SUPPORTED
- : boost::detail::win32::GetLastError());
+ : boost::detail::winapi::GetLastError());
if (BOOST_CHRONO_IS_THROWS(ec)) {
boost::throw_exception(
system::system_error(
@@ -89,15 +89,8 @@
BOOST_CHRONO_INLINE
system_clock::time_point system_clock::now() BOOST_NOEXCEPT
{
- 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
+ boost::detail::winapi::FILETIME_ ft;
+ boost::detail::winapi::GetSystemTimeAsFileTime( &ft ); // never fails
return system_clock::time_point(
system_clock::duration(
((static_cast<__int64>( ft.dwHighDateTime ) << 32) | ft.dwLowDateTime)
@@ -110,15 +103,8 @@
BOOST_CHRONO_INLINE
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
+ boost::detail::winapi::FILETIME_ ft;
+ boost::detail::winapi::GetSystemTimeAsFileTime( &ft ); // never fails
if (!BOOST_CHRONO_IS_THROWS(ec))
{
ec.clear();
@@ -132,7 +118,6 @@
std::time_t system_clock::to_time_t(const system_clock::time_point& t) BOOST_NOEXCEPT
{
__int64 temp = t.time_since_epoch().count();
-
temp /= 10000000;
return static_cast<std::time_t>( temp );
}
@@ -142,7 +127,6 @@
{
__int64 temp = t;
temp *= 10000000;
-
return time_point(duration(temp));
}
Modified: branches/release/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp
==============================================================================
--- branches/release/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp Sun Sep 22 05:12:38 2013 (r85817)
+++ branches/release/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp 2013-09-22 05:57:15 EDT (Sun, 22 Sep 2013) (r85818)
@@ -18,9 +18,9 @@
#include <cassert>
#include <time.h>
-#include <boost/detail/win/GetLastError.hpp>
-#include <boost/detail/win/GetCurrentProcess.hpp>
-#include <boost/detail/win/GetProcessTimes.hpp>
+#include <boost/detail/winapi/GetLastError.hpp>
+#include <boost/detail/winapi/GetCurrentProcess.hpp>
+#include <boost/detail/winapi/GetProcessTimes.hpp>
namespace boost
{
@@ -68,10 +68,10 @@
{
// note that Windows uses 100 nanosecond ticks for FILETIME
- boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
+ boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
- if ( boost::detail::win32::GetProcessTimes(
- boost::detail::win32::GetCurrentProcess(), &creation, &exit,
+ if ( boost::detail::winapi::GetProcessTimes(
+ boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
{
return time_point(duration(
@@ -93,10 +93,10 @@
{
// note that Windows uses 100 nanosecond ticks for FILETIME
- boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
+ boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
- if ( boost::detail::win32::GetProcessTimes(
- boost::detail::win32::GetCurrentProcess(), &creation, &exit,
+ if ( boost::detail::winapi::GetProcessTimes(
+ boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
{
if (!BOOST_CHRONO_IS_THROWS(ec))
@@ -110,7 +110,7 @@
}
else
{
- boost::detail::win32::DWORD_ cause = boost::detail::win32::GetLastError();
+ boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
if (BOOST_CHRONO_IS_THROWS(ec))
{
boost::throw_exception(
@@ -133,10 +133,10 @@
{
// note that Windows uses 100 nanosecond ticks for FILETIME
- boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
+ boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
- if ( boost::detail::win32::GetProcessTimes(
- boost::detail::win32::GetCurrentProcess(), &creation, &exit,
+ if ( boost::detail::winapi::GetProcessTimes(
+ boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
{
return time_point(duration(
@@ -158,10 +158,10 @@
{
// note that Windows uses 100 nanosecond ticks for FILETIME
- boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
+ boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
- if ( boost::detail::win32::GetProcessTimes(
- boost::detail::win32::GetCurrentProcess(), &creation, &exit,
+ if ( boost::detail::winapi::GetProcessTimes(
+ boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
{
if (!BOOST_CHRONO_IS_THROWS(ec))
@@ -175,7 +175,7 @@
}
else
{
- boost::detail::win32::DWORD_ cause = boost::detail::win32::GetLastError();
+ boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
if (BOOST_CHRONO_IS_THROWS(ec))
{
boost::throw_exception(
@@ -198,10 +198,10 @@
{
// note that Windows uses 100 nanosecond ticks for FILETIME
- boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
+ boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
- if ( boost::detail::win32::GetProcessTimes(
- boost::detail::win32::GetCurrentProcess(), &creation, &exit,
+ if ( boost::detail::winapi::GetProcessTimes(
+ boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
{
time_point::rep r(process_real_cpu_clock::now().time_since_epoch().count()
@@ -229,10 +229,10 @@
{
// note that Windows uses 100 nanosecond ticks for FILETIME
- boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
+ boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
- if ( boost::detail::win32::GetProcessTimes(
- boost::detail::win32::GetCurrentProcess(), &creation, &exit,
+ if ( boost::detail::winapi::GetProcessTimes(
+ boost::detail::winapi::GetCurrentProcess(), &creation, &exit,
&system_time, &user_time ) )
{
if (!BOOST_CHRONO_IS_THROWS(ec))
@@ -252,7 +252,7 @@
}
else
{
- boost::detail::win32::DWORD_ cause = boost::detail::win32::GetLastError();
+ boost::detail::winapi::DWORD_ cause = boost::detail::winapi::GetLastError();
if (BOOST_CHRONO_IS_THROWS(ec))
{
boost::throw_exception(
Modified: branches/release/boost/chrono/detail/inlined/win/thread_clock.hpp
==============================================================================
--- branches/release/boost/chrono/detail/inlined/win/thread_clock.hpp Sun Sep 22 05:12:38 2013 (r85817)
+++ branches/release/boost/chrono/detail/inlined/win/thread_clock.hpp 2013-09-22 05:57:15 EDT (Sun, 22 Sep 2013) (r85818)
@@ -15,9 +15,9 @@
#include <boost/chrono/thread_clock.hpp>
#include <cassert>
-#include <boost/detail/win/GetLastError.hpp>
-#include <boost/detail/win/GetCurrentThread.hpp>
-#include <boost/detail/win/GetThreadTimes.hpp>
+#include <boost/detail/winapi/GetLastError.hpp>
+#include <boost/detail/winapi/GetCurrentThread.hpp>
+#include <boost/detail/winapi/GetThreadTimes.hpp>
namespace boost
{
@@ -28,10 +28,10 @@
thread_clock::time_point thread_clock::now( system::error_code & ec )
{
// note that Windows uses 100 nanosecond ticks for FILETIME
- boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
+ boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
- if ( boost::detail::win32::GetThreadTimes(
- boost::detail::win32::GetCurrentThread (), &creation, &exit,
+ if ( boost::detail::winapi::GetThreadTimes(
+ boost::detail::winapi::GetCurrentThread (), &creation, &exit,
&system_time, &user_time ) )
{
duration user = duration(
@@ -55,13 +55,13 @@
{
boost::throw_exception(
system::system_error(
- boost::detail::win32::GetLastError(),
+ boost::detail::winapi::GetLastError(),
BOOST_CHRONO_SYSTEM_CATEGORY,
"chrono::thread_clock" ));
}
else
{
- ec.assign( boost::detail::win32::GetLastError(), BOOST_CHRONO_SYSTEM_CATEGORY );
+ ec.assign( boost::detail::winapi::GetLastError(), BOOST_CHRONO_SYSTEM_CATEGORY );
return thread_clock::time_point(duration(0));
}
}
@@ -72,10 +72,10 @@
{
// note that Windows uses 100 nanosecond ticks for FILETIME
- boost::detail::win32::FILETIME_ creation, exit, user_time, system_time;
+ boost::detail::winapi::FILETIME_ creation, exit, user_time, system_time;
- if ( boost::detail::win32::GetThreadTimes(
- boost::detail::win32::GetCurrentThread (), &creation, &exit,
+ if ( boost::detail::winapi::GetThreadTimes(
+ boost::detail::winapi::GetCurrentThread (), &creation, &exit,
&system_time, &user_time ) )
{
duration user = duration(
Modified: branches/release/boost/thread/win32/thread_primitives.hpp
==============================================================================
--- branches/release/boost/thread/win32/thread_primitives.hpp Sun Sep 22 05:12:38 2013 (r85817)
+++ branches/release/boost/thread/win32/thread_primitives.hpp 2013-09-22 05:57:15 EDT (Sun, 22 Sep 2013) (r85818)
@@ -15,7 +15,7 @@
#include <boost/assert.hpp>
#include <boost/thread/exceptions.hpp>
#include <boost/detail/interlocked.hpp>
-//#include <boost/detail/win/synchronization.hpp>
+//#include <boost/detail/winapi/synchronization.hpp>
#include <algorithm>
#ifndef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
Modified: branches/release/libs/chrono/test/Jamfile.v2
==============================================================================
--- branches/release/libs/chrono/test/Jamfile.v2 Sun Sep 22 05:12:38 2013 (r85817)
+++ branches/release/libs/chrono/test/Jamfile.v2 2013-09-22 05:57:15 EDT (Sun, 22 Sep 2013) (r85818)
@@ -13,17 +13,17 @@
project
: requirements
- <target-os>freebsd:<linkflags>"-lrt"
- <target-os>linux:<linkflags>"-lrt -lpthread"
- <toolset>clang/<target-os>linux:<linkflags>"-lpthread"
- <toolset>pgi:<linkflags>"-lrt"
+ <target-os>freebsd:<linkflags>"-lrt"
+ <target-os>linux:<linkflags>"-lrt -lpthread"
+ <toolset>clang/<target-os>linux:<linkflags>"-lpthread"
+ <toolset>pgi:<linkflags>"-lrt"
#<threading>single:<define>BOOST_CHRONO_THREAD_DISABLED
<toolset>msvc:<asynch-exceptions>on
<define>BOOST_CHRONO_USES_MPL_ASSERT
<define>BOOST_SYSTEM_NO_DEPRECATED
#<toolset>sun:<define>BOOST_COMMON_TYPE_DONT_USE_TYPEOF
#<toolset>sun:<define>BOOST_TYPEOF_EMULATION
- <toolset>sun:<define>__typeof__=__typeof__
+ <toolset>sun:<define>__typeof__=__typeof__
<warnings>all
<toolset>gcc:<cxxflags>-Wextra
<toolset>gcc:<cxxflags>-pedantic
@@ -57,7 +57,7 @@
<toolset>intel:<cxxflags>-wd193,304,383,444
<toolset>intel:<cxxflags>-wd593,981
<toolset>intel:<cxxflags>-wd1418
- <toolset>intel:<cxxflags>-wd2415
+ <toolset>intel:<cxxflags>-wd2415
;
rule chrono-run ( sources )
@@ -252,13 +252,13 @@
rule chrono-run-check ( sources )
{
return
- [ run $(sources)
+ [ run $(sources)
: :
:
<library>/boost/system//boost_system
<define>BOOST_CHRONO_VERSION=2
: $(sources[1]:B)_d ]
- [ run $(sources)
+ [ run $(sources)
: :
:
<library>/boost/system//boost_system/<link>static
@@ -277,13 +277,13 @@
rule chrono-run-check2 ( sources : name )
{
return
- [ run $(sources)
+ [ run $(sources)
: :
:
<library>/boost/system//boost_system
<define>BOOST_CHRONO_VERSION=2
: $(name)_d ]
- [ run $(sources)
+ [ run $(sources)
: :
:
<library>/boost/system//boost_system/<link>static
Modified: branches/release/libs/chrono/test/win32_test.cpp
==============================================================================
--- branches/release/libs/chrono/test/win32_test.cpp Sun Sep 22 05:12:38 2013 (r85817)
+++ branches/release/libs/chrono/test/win32_test.cpp 2013-09-22 05:57:15 EDT (Sun, 22 Sep 2013) (r85818)
@@ -18,91 +18,91 @@
#include <boost/type_traits.hpp>
#include <boost/typeof/typeof.hpp>
#undef BOOST_USE_WINDOWS_H
-#include <boost/detail/win/basic_types.hpp>
-#include <boost/detail/win/time.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/time.hpp>
#include <windows.h>
void test() {
{
- boost::detail::win32::LARGE_INTEGER_ a;
+ boost::detail::winapi::LARGE_INTEGER_ a;
LARGE_INTEGER b;
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::LARGE_INTEGER_)==sizeof(LARGE_INTEGER)
- ), NOTHING, (boost::detail::win32::LARGE_INTEGER_, LARGE_INTEGER));
+ sizeof(boost::detail::winapi::LARGE_INTEGER_)==sizeof(LARGE_INTEGER)
+ ), NOTHING, (boost::detail::winapi::LARGE_INTEGER_, LARGE_INTEGER));
BOOST_TEST((
sizeof(a.QuadPart)==sizeof(b.QuadPart)
));
BOOST_CHRONO_STATIC_ASSERT((
- offsetof(boost::detail::win32::LARGE_INTEGER_, QuadPart)==offsetof(LARGE_INTEGER, QuadPart)
- ), NOTHING, (boost::detail::win32::LARGE_INTEGER_, LARGE_INTEGER));
+ offsetof(boost::detail::winapi::LARGE_INTEGER_, QuadPart)==offsetof(LARGE_INTEGER, QuadPart)
+ ), NOTHING, (boost::detail::winapi::LARGE_INTEGER_, LARGE_INTEGER));
BOOST_CHRONO_STATIC_ASSERT((
boost::is_same<
BOOST_TYPEOF(a.QuadPart),
BOOST_TYPEOF(b.QuadPart)
>::value
- ), NOTHING, (boost::detail::win32::LARGE_INTEGER_, LARGE_INTEGER));
+ ), NOTHING, (boost::detail::winapi::LARGE_INTEGER_, LARGE_INTEGER));
}
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::BOOL_)==sizeof(BOOL)
- ), NOTHING, (boost::detail::win32::BOOL_, BOOL));
+ sizeof(boost::detail::winapi::BOOL_)==sizeof(BOOL)
+ ), NOTHING, (boost::detail::winapi::BOOL_, BOOL));
BOOST_CHRONO_STATIC_ASSERT((
- boost::is_same<boost::detail::win32::BOOL_,BOOL>::value
- ), NOTHING, (boost::detail::win32::BOOL_, BOOL));
+ boost::is_same<boost::detail::winapi::BOOL_,BOOL>::value
+ ), NOTHING, (boost::detail::winapi::BOOL_, BOOL));
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::DWORD_)==sizeof(DWORD)
- ), NOTHING, (boost::detail::win32::DWORD_, DWORD));
+ sizeof(boost::detail::winapi::DWORD_)==sizeof(DWORD)
+ ), NOTHING, (boost::detail::winapi::DWORD_, DWORD));
BOOST_CHRONO_STATIC_ASSERT((
- boost::is_same<boost::detail::win32::DWORD_,DWORD>::value
- ), NOTHING, (boost::detail::win32::DWORD_, DWORD));
+ boost::is_same<boost::detail::winapi::DWORD_,DWORD>::value
+ ), NOTHING, (boost::detail::winapi::DWORD_, DWORD));
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::HANDLE_)==sizeof(HANDLE)
- ), NOTHING, (boost::detail::win32::HANDLE_, HANDLE));
+ sizeof(boost::detail::winapi::HANDLE_)==sizeof(HANDLE)
+ ), NOTHING, (boost::detail::winapi::HANDLE_, HANDLE));
BOOST_CHRONO_STATIC_ASSERT((
- boost::is_same<boost::detail::win32::HANDLE_,HANDLE>::value
- ), NOTHING, (boost::detail::win32::HANDLE_, HANDLE));
+ boost::is_same<boost::detail::winapi::HANDLE_,HANDLE>::value
+ ), NOTHING, (boost::detail::winapi::HANDLE_, HANDLE));
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::LONG_)==sizeof(LONG)
- ), NOTHING, (boost::detail::win32::LONG_, LONG));
+ sizeof(boost::detail::winapi::LONG_)==sizeof(LONG)
+ ), NOTHING, (boost::detail::winapi::LONG_, LONG));
BOOST_CHRONO_STATIC_ASSERT((
- boost::is_same<boost::detail::win32::LONG_,LONG>::value
- ), NOTHING, (boost::detail::win32::LONG_, LONG));
+ boost::is_same<boost::detail::winapi::LONG_,LONG>::value
+ ), NOTHING, (boost::detail::winapi::LONG_, LONG));
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::LONGLONG_)==sizeof(LONGLONG)
- ), NOTHING, (boost::detail::win32::LONGLONG_, LONGLONG));
+ sizeof(boost::detail::winapi::LONGLONG_)==sizeof(LONGLONG)
+ ), NOTHING, (boost::detail::winapi::LONGLONG_, LONGLONG));
BOOST_CHRONO_STATIC_ASSERT((
- boost::is_same<boost::detail::win32::LONGLONG_,LONGLONG>::value
- ), NOTHING, (boost::detail::win32::LONGLONG_, LONGLONG));
+ boost::is_same<boost::detail::winapi::LONGLONG_,LONGLONG>::value
+ ), NOTHING, (boost::detail::winapi::LONGLONG_, LONGLONG));
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::ULONG_PTR_)==sizeof(ULONG_PTR)
- ), NOTHING, (boost::detail::win32::ULONG_PTR_, ULONG_PTR));
+ sizeof(boost::detail::winapi::ULONG_PTR_)==sizeof(ULONG_PTR)
+ ), NOTHING, (boost::detail::winapi::ULONG_PTR_, ULONG_PTR));
BOOST_CHRONO_STATIC_ASSERT((
- boost::is_same<boost::detail::win32::ULONG_PTR_,ULONG_PTR>::value
- ), NOTHING, (boost::detail::win32::ULONG_PTR_, ULONG_PTR));
+ boost::is_same<boost::detail::winapi::ULONG_PTR_,ULONG_PTR>::value
+ ), NOTHING, (boost::detail::winapi::ULONG_PTR_, ULONG_PTR));
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::PLARGE_INTEGER_)==sizeof(PLARGE_INTEGER)
- ), NOTHING, (boost::detail::win32::PLARGE_INTEGER_, PLARGE_INTEGER));
+ sizeof(boost::detail::winapi::PLARGE_INTEGER_)==sizeof(PLARGE_INTEGER)
+ ), NOTHING, (boost::detail::winapi::PLARGE_INTEGER_, PLARGE_INTEGER));
//~ BOOST_CHRONO_STATIC_ASSERT((
- //~ boost::is_same<boost::detail::win32::PLARGE_INTEGER_,PLARGE_INTEGER>::value
- //~ ), NOTHING, (boost::detail::win32::PLARGE_INTEGER_, PLARGE_INTEGER));
+ //~ boost::is_same<boost::detail::winapi::PLARGE_INTEGER_,PLARGE_INTEGER>::value
+ //~ ), NOTHING, (boost::detail::winapi::PLARGE_INTEGER_, PLARGE_INTEGER));
{
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::FILETIME_)==sizeof(FILETIME)
- ), NOTHING, (boost::detail::win32::FILETIME_, FILETIME));
+ sizeof(boost::detail::winapi::FILETIME_)==sizeof(FILETIME)
+ ), NOTHING, (boost::detail::winapi::FILETIME_, FILETIME));
BOOST_CHRONO_STATIC_ASSERT((
- sizeof(boost::detail::win32::PFILETIME_)==sizeof(PFILETIME)
- ), NOTHING, (boost::detail::win32::PFILETIME_, PFILETIME));
+ sizeof(boost::detail::winapi::PFILETIME_)==sizeof(PFILETIME)
+ ), NOTHING, (boost::detail::winapi::PFILETIME_, PFILETIME));
- boost::detail::win32::FILETIME_ a;
+ boost::detail::winapi::FILETIME_ a;
FILETIME b;
BOOST_TEST((
sizeof(a.dwLowDateTime)==sizeof(b.dwLowDateTime)
@@ -111,28 +111,28 @@
sizeof(a.dwHighDateTime)==sizeof(b.dwHighDateTime)
));
BOOST_CHRONO_STATIC_ASSERT((
- offsetof(boost::detail::win32::FILETIME_, dwLowDateTime)==offsetof(FILETIME, dwLowDateTime)
- ), NOTHING, (boost::detail::win32::FILETIME_, FILETIME));
+ offsetof(boost::detail::winapi::FILETIME_, dwLowDateTime)==offsetof(FILETIME, dwLowDateTime)
+ ), NOTHING, (boost::detail::winapi::FILETIME_, FILETIME));
BOOST_CHRONO_STATIC_ASSERT((
- offsetof(boost::detail::win32::FILETIME_, dwHighDateTime)==offsetof(FILETIME, dwHighDateTime)
- ), NOTHING, (boost::detail::win32::FILETIME_, FILETIME));
+ offsetof(boost::detail::winapi::FILETIME_, dwHighDateTime)==offsetof(FILETIME, dwHighDateTime)
+ ), NOTHING, (boost::detail::winapi::FILETIME_, FILETIME));
BOOST_CHRONO_STATIC_ASSERT((
boost::is_same<
BOOST_TYPEOF(a.dwLowDateTime),
BOOST_TYPEOF(b.dwLowDateTime)
>::value
- ), NOTHING, (boost::detail::win32::FILETIME_, FILETIME));
+ ), NOTHING, (boost::detail::winapi::FILETIME_, FILETIME));
BOOST_CHRONO_STATIC_ASSERT((
boost::is_same<
BOOST_TYPEOF(a.dwHighDateTime),
BOOST_TYPEOF(b.dwHighDateTime)
>::value
- ), NOTHING, (boost::detail::win32::FILETIME_, FILETIME));
+ ), NOTHING, (boost::detail::winapi::FILETIME_, FILETIME));
}
// BOOST_CHRONO_STATIC_ASSERT((
-// GetLastError==boost::detail::win32::::GetLastError
+// GetLastError==boost::detail::winapi::::GetLastError
// ), NOTHING, ());
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk