Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r85791 - in trunk: boost/chrono/detail/inlined/win boost/detail/win boost/detail/winapi boost/sync/detail boost/sync/detail/event boost/sync/detail/mutexes boost/sync/detail/semaphore libs/chrono/test
From: andrey.semashev_at_[hidden]
Date: 2013-09-19 13:58:24

Next message: andrey.semashev_at_[hidden]: "[Boost-commit] svn:boost r85792 - trunk/libs/sync/test"
Previous message: pbristow_at_[hidden]: "[Boost-commit] svn:boost r85790 - in trunk/boost/math: distributions distributions/detail policies"

Author: andysem
Date: 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013)
New Revision: 85791
URL: http://svn.boost.org/trac/boost/changeset/85791

Log:
To avoid name clashes with Boost.Thread, renamed boost::detail::win32 namespace to winapi. Also renamed the directory with headers accordingly. Adjusted Boost.Chrono and Boost.Sync to reflect the changes.

Added:
   trunk/boost/detail/winapi/
      - copied from r85790, trunk/boost/detail/win/
Deleted:
   trunk/boost/detail/win/
Text files modified:
   trunk/boost/chrono/detail/inlined/win/chrono.hpp | 44 ++++++------------
   trunk/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp | 48 ++++++++++----------
   trunk/boost/chrono/detail/inlined/win/thread_clock.hpp | 22 ++++----
   trunk/boost/detail/winapi/GetCurrentProcess.hpp | 14 +++--
   trunk/boost/detail/winapi/GetCurrentThread.hpp | 14 +++--
   trunk/boost/detail/winapi/GetLastError.hpp | 14 +++--
   trunk/boost/detail/winapi/GetProcessTimes.hpp | 14 +++--
   trunk/boost/detail/winapi/GetThreadTimes.hpp | 14 +++--
   trunk/boost/detail/winapi/LocalFree.hpp | 14 +++--
   trunk/boost/detail/winapi/basic_types.hpp | 15 ++++--
   trunk/boost/detail/winapi/directory_management.hpp | 17 ++++--
   trunk/boost/detail/winapi/dll.hpp | 17 ++++--
   trunk/boost/detail/winapi/error_handling.hpp | 17 ++++--
   trunk/boost/detail/winapi/file_management.hpp | 16 ++++--
   trunk/boost/detail/winapi/handles.hpp | 13 +++--
   trunk/boost/detail/winapi/memory.hpp | 21 ++++----
   trunk/boost/detail/winapi/process.hpp | 16 ++++--
   trunk/boost/detail/winapi/security.hpp | 13 +++--
   trunk/boost/detail/winapi/synchronization.hpp | 55 +++++++++++-----------
   trunk/boost/detail/winapi/system.hpp | 18 ++++---
   trunk/boost/detail/winapi/thread.hpp | 16 ++++--
   trunk/boost/detail/winapi/time.hpp | 13 +++--
   trunk/boost/detail/winapi/timers.hpp | 13 +++--
   trunk/boost/sync/detail/event/event_windows.hpp | 41 +++++++----------
   trunk/boost/sync/detail/mutexes/mutex_windows.hpp | 26 +++++-----
   trunk/boost/sync/detail/semaphore/semaphore_windows.hpp | 49 ++++++++-----------
   trunk/boost/sync/detail/time_units.hpp | 6 +-
   trunk/libs/chrono/test/win32_test.cpp | 96 ++++++++++++++++++++--------------------
   28 files changed, 358 insertions(+), 318 deletions(-)

Modified: trunk/boost/chrono/detail/inlined/win/chrono.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/win/chrono.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/chrono/detail/inlined/win/chrono.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -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();

Modified: trunk/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -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: trunk/boost/chrono/detail/inlined/win/thread_clock.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/win/thread_clock.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/chrono/detail/inlined/win/thread_clock.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -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: trunk/boost/detail/winapi/GetCurrentProcess.hpp
==============================================================================
--- trunk/boost/detail/win/GetCurrentProcess.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/GetCurrentProcess.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,14 +6,18 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_GETCURRENTPROCESS_HPP
-#define BOOST_DETAIL_WIN_GETCURRENTPROCESS_HPP
+#ifndef BOOST_DETAIL_WINAPI_GETCURRENTPROCESS_HPP
+#define BOOST_DETAIL_WINAPI_GETCURRENTPROCESS_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( BOOST_USE_WINDOWS_H )
using ::GetCurrentProcess;
#else
@@ -22,4 +26,4 @@
}
}
}
-#endif // BOOST_DETAIL_WIN_TIME_HPP
+#endif // BOOST_DETAIL_WINAPI_GETCURRENTPROCESS_HPP

Modified: trunk/boost/detail/winapi/GetCurrentThread.hpp
==============================================================================
--- trunk/boost/detail/win/GetCurrentThread.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/GetCurrentThread.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,14 +6,18 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_GETCURRENTTHREAD_HPP
-#define BOOST_DETAIL_WIN_GETCURRENTTHREAD_HPP
+#ifndef BOOST_DETAIL_WINAPI_GETCURRENTTHREAD_HPP
+#define BOOST_DETAIL_WINAPI_GETCURRENTTHREAD_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( UNDER_CE )
// Windows CE define GetCurrentThread as an inline function in kfuncs.h
inline HANDLE_ GetCurrentThread()
@@ -31,4 +35,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_TIME_HPP
+#endif // BOOST_DETAIL_WINAPI_GETCURRENTTHREAD_HPP

Modified: trunk/boost/detail/winapi/GetLastError.hpp
==============================================================================
--- trunk/boost/detail/win/GetLastError.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/GetLastError.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,14 +6,18 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_GETLASTERROR_HPP
-#define BOOST_DETAIL_WIN_GETLASTERROR_HPP
+#ifndef BOOST_DETAIL_WINAPI_GETLASTERROR_HPP
+#define BOOST_DETAIL_WINAPI_GETLASTERROR_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( BOOST_USE_WINDOWS_H )
using ::GetLastError;
#else
@@ -24,4 +28,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_TIME_HPP
+#endif // BOOST_DETAIL_WINAPI_GETLASTERROR_HPP

Modified: trunk/boost/detail/winapi/GetProcessTimes.hpp
==============================================================================
--- trunk/boost/detail/win/GetProcessTimes.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/GetProcessTimes.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,14 +6,18 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_GETPROCESSTIMES_HPP
-#define BOOST_DETAIL_WIN_GETPROCESSTIMES_HPP
+#ifndef BOOST_DETAIL_WINAPI_GETPROCESSTIMES_HPP
+#define BOOST_DETAIL_WINAPI_GETPROCESSTIMES_HPP

-#include <boost/detail/win/time.hpp>
+#include <boost/detail/winapi/time.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if !defined(UNDER_CE) // Windows CE does not define GetProcessTimes
#if defined( BOOST_USE_WINDOWS_H )
using ::GetProcessTimes;
@@ -32,4 +36,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_GETPROCESSTIMES_HPP
+#endif // BOOST_DETAIL_WINAPI_GETPROCESSTIMES_HPP

Modified: trunk/boost/detail/winapi/GetThreadTimes.hpp
==============================================================================
--- trunk/boost/detail/win/GetThreadTimes.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/GetThreadTimes.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,14 +6,18 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_GETTHREADTIMES_HPP
-#define BOOST_DETAIL_WIN_GETTHREADTIMES_HPP
+#ifndef BOOST_DETAIL_WINAPI_GETTHREADTIMES_HPP
+#define BOOST_DETAIL_WINAPI_GETTHREADTIMES_HPP

-#include <boost/detail/win/time.hpp>
+#include <boost/detail/winapi/time.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( BOOST_USE_WINDOWS_H )
using ::GetThreadTimes;
#else
@@ -30,4 +34,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_GETTHREADTIMES_HPP
+#endif // BOOST_DETAIL_WINAPI_GETTHREADTIMES_HPP

Modified: trunk/boost/detail/winapi/LocalFree.hpp
==============================================================================
--- trunk/boost/detail/win/LocalFree.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/LocalFree.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,14 +6,18 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_LOCALFREE_HPP
-#define BOOST_DETAIL_WIN_LOCALFREE_HPP
+#ifndef BOOST_DETAIL_WINAPI_LOCALFREE_HPP
+#define BOOST_DETAIL_WINAPI_LOCALFREE_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( BOOST_USE_WINDOWS_H )
typedef HANDLE_ HLOCAL_;

@@ -26,4 +30,4 @@
}
}
}
-#endif // BOOST_DETAIL_WIN_LOCALFREE_HPP
+#endif // BOOST_DETAIL_WINAPI_LOCALFREE_HPP

Modified: trunk/boost/detail/winapi/basic_types.hpp
==============================================================================
--- trunk/boost/detail/win/basic_types.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/basic_types.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,11 +6,13 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_BASIC_TYPES_HPP
-#define BOOST_DETAIL_WIN_BASIC_TYPES_HPP
+#ifndef BOOST_DETAIL_WINAPI_BASIC_TYPES_HPP
+#define BOOST_DETAIL_WINAPI_BASIC_TYPES_HPP
+
#include <boost/config.hpp>
#include <cstdarg>
#include <boost/cstdint.hpp>
+
#if defined( BOOST_USE_WINDOWS_H )
# include <windows.h>
#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__)
@@ -33,9 +35,13 @@
# error "Win32 functions not available"
#endif

+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( BOOST_USE_WINDOWS_H )
     typedef ::BOOL BOOL_;
     typedef ::WORD WORD_;
@@ -102,10 +108,9 @@
     typedef wchar_t WCHAR_;
     typedef WCHAR_ *LPWSTR_;
     typedef const WCHAR_ *LPCWSTR_;
-
}
#endif
}
}
}
-#endif // BOOST_DETAIL_WIN_TIME_HPP
+#endif // BOOST_DETAIL_WINAPI_TIME_HPP

Modified: trunk/boost/detail/winapi/directory_management.hpp
==============================================================================
--- trunk/boost/detail/win/directory_management.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/directory_management.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,17 +6,21 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_DIRECTORY_MANAGEMENT_HPP
-#define BOOST_DETAIL_WIN_DIRECTORY_MANAGEMENT_HPP
+#ifndef BOOST_DETAIL_WINAPI_DIRECTORY_MANAGEMENT_HPP
+#define BOOST_DETAIL_WINAPI_DIRECTORY_MANAGEMENT_HPP

-#include <boost/detail/win/basic_types.hpp>
-#include <boost/detail/win/security.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/security.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
     using ::CreateDirectory;
@@ -33,11 +37,10 @@
         GetTempPathA(unsigned long length, char *buffer);
     __declspec(dllimport) int __stdcall
         RemoveDirectoryA(LPCTSTR_);
-
}
#endif
}
}
}

-#endif // BOOST_DETAIL_WIN_THREAD_HPP
+#endif // BOOST_DETAIL_WINAPI_THREAD_HPP

Modified: trunk/boost/detail/winapi/dll.hpp
==============================================================================
--- trunk/boost/detail/win/dll.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/dll.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,17 +6,21 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_DLL_HPP
-#define BOOST_DETAIL_WIN_DLL_HPP
+#ifndef BOOST_DETAIL_WINAPI_DLL_HPP
+#define BOOST_DETAIL_WINAPI_DLL_HPP

-#include <boost/detail/win/basic_types.hpp>
-#include <boost/detail/win/security.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/security.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
     using ::LoadLibrary;
@@ -42,11 +46,10 @@
         GetModuleHandleA(
             LPCSTR_ lpProcName
     );
-
}
#endif
}
}
}

-#endif // BOOST_DETAIL_WIN_THREAD_HPP
+#endif // BOOST_DETAIL_WINAPI_THREAD_HPP

Modified: trunk/boost/detail/winapi/error_handling.hpp
==============================================================================
--- trunk/boost/detail/win/error_handling.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/error_handling.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,15 +6,20 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_ERROR_HANDLING_HPP
-#define BOOST_DETAIL_WIN_ERROR_HANDLING_HPP
+#ifndef BOOST_DETAIL_WINAPI_ERROR_HANDLING_HPP
+#define BOOST_DETAIL_WINAPI_ERROR_HANDLING_HPP

-#include <boost/detail/win/basic_types.hpp>
-#include <boost/detail/win/GetCurrentThread.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/GetCurrentThread.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
+
#if defined( BOOST_USE_WINDOWS_H )
using ::FormatMessageA;
using ::FormatMessageW;
@@ -85,4 +90,4 @@
}
}
}
-#endif // BOOST_DETAIL_WIN_ERROR_HANDLING_HPP
+#endif // BOOST_DETAIL_WINAPI_ERROR_HANDLING_HPP

Modified: trunk/boost/detail/winapi/file_management.hpp
==============================================================================
--- trunk/boost/detail/win/file_management.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/file_management.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,17 +6,21 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_FILE_MANAGEMENT_HPP
-#define BOOST_DETAIL_WIN_FILE_MANAGEMENT_HPP
+#ifndef BOOST_DETAIL_WINAPI_FILE_MANAGEMENT_HPP
+#define BOOST_DETAIL_WINAPI_FILE_MANAGEMENT_HPP

-#include <boost/detail/win/basic_types.hpp>
-#include <boost/detail/win/security.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/security.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
using ::CreateFileA;
@@ -123,4 +127,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_THREAD_HPP
+#endif // BOOST_DETAIL_WINAPI_THREAD_HPP

Modified: trunk/boost/detail/winapi/handles.hpp
==============================================================================
--- trunk/boost/detail/win/handles.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/handles.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,17 +6,20 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_HANDLES_HPP
-#define BOOST_DETAIL_WIN_HANDLES_HPP
+#ifndef BOOST_DETAIL_WINAPI_HANDLES_HPP
+#define BOOST_DETAIL_WINAPI_HANDLES_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>

+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
using ::CloseHandle;
@@ -34,4 +37,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_HANDLES_HPP
+#endif // BOOST_DETAIL_WINAPI_HANDLES_HPP

Modified: trunk/boost/detail/winapi/memory.hpp
==============================================================================
--- trunk/boost/detail/win/memory.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/memory.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,19 +6,22 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_MEMORY_HPP
-#define BOOST_DETAIL_WIN_MEMORY_HPP
+#ifndef BOOST_DETAIL_WINAPI_MEMORY_HPP
+#define BOOST_DETAIL_WINAPI_MEMORY_HPP

-#include <boost/detail/win/basic_types.hpp>
-#include <boost/detail/win/security.hpp>
-#include <boost/detail/win/LocalFree.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/security.hpp>
+#include <boost/detail/winapi/LocalFree.hpp>

+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
     using ::CreateFileMappingA;
@@ -30,9 +33,7 @@
     using ::OpenFileMappingA;
     using ::UnmapViewOfFile;
#else
-# ifdef HeapAlloc
-# undef HeapAlloc
-# endif
+#undef HeapAlloc
extern "C" {
     __declspec(dllimport) void * __stdcall
         CreateFileMappingA (void *, SECURITY_ATTRIBUTES_*, unsigned long, unsigned long, unsigned long, const char *);
@@ -56,4 +57,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_SYNCHRONIZATION_HPP
+#endif // BOOST_DETAIL_WINAPI_MEMORY_HPP

Modified: trunk/boost/detail/winapi/process.hpp
==============================================================================
--- trunk/boost/detail/win/process.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/process.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,15 +6,19 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_PROCESS_HPP
-#define BOOST_DETAIL_WIN_PROCESS_HPP
+#ifndef BOOST_DETAIL_WINAPI_PROCESS_HPP
+#define BOOST_DETAIL_WINAPI_PROCESS_HPP

-#include <boost/detail/win/basic_types.hpp>
-#include <boost/detail/win/GetCurrentProcess.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/GetCurrentProcess.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( BOOST_USE_WINDOWS_H )
using ::GetCurrentProcessId;
#else
@@ -30,4 +34,4 @@
}
}
}
-#endif // BOOST_DETAIL_WIN_PROCESS_HPP
+#endif // BOOST_DETAIL_WINAPI_PROCESS_HPP

Modified: trunk/boost/detail/winapi/security.hpp
==============================================================================
--- trunk/boost/detail/win/security.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/security.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,17 +6,20 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_SECURITY_HPP
-#define BOOST_DETAIL_WIN_SECURITY_HPP
+#ifndef BOOST_DETAIL_WINAPI_SECURITY_HPP
+#define BOOST_DETAIL_WINAPI_SECURITY_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>

+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
typedef ::SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES_;
@@ -59,4 +62,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_SECURITY_HPP
+#endif // BOOST_DETAIL_WINAPI_SECURITY_HPP

Modified: trunk/boost/detail/winapi/synchronization.hpp
==============================================================================
--- trunk/boost/detail/win/synchronization.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/synchronization.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,17 +6,20 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_SYNCHRONIZATION_HPP
-#define BOOST_DETAIL_WIN_SYNCHRONIZATION_HPP
+#ifndef BOOST_DETAIL_WINAPI_SYNCHRONIZATION_HPP
+#define BOOST_DETAIL_WINAPI_SYNCHRONIZATION_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>

+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
     typedef ::CRITICAL_SECTION CRITICAL_SECTION_;
@@ -47,17 +50,16 @@
     using ::WaitForSingleObject;
     using ::QueueUserAPC;

- enum
- {
- infinite = INFINITE,
- wait_abandoned = WAIT_ABANDONED,
- wait_object_0 = WAIT_OBJECT_0,
- wait_timeout = WAIT_TIMEOUT,
- wait_failed = WAIT_FAILED
- };
+ const DWORD_ infinite = INFINITE;
+ const DWORD_ wait_abandoned = WAIT_ABANDONED;
+ const DWORD_ wait_object_0 = WAIT_OBJECT_0;
+ const DWORD_ wait_timeout = WAIT_TIMEOUT;
+ const DWORD_ wait_failed = WAIT_FAILED;
+
+#else // defined( BOOST_USE_WINDOWS_H )

-#else
extern "C" {
+
     struct CRITICAL_SECTION_
     {
         struct critical_section_debug * DebugInfo;
@@ -114,9 +116,9 @@
                 unsigned long dwMilliseconds);
     __declspec(dllimport) int __stdcall
         ReleaseSemaphore(void*,long,long*);
- typedef void (__stdcall *PAPCFUNC8)(ulong_ptr);
+ typedef void (__stdcall *PAPCFUNC8)(ULONG_PTR_);
     __declspec(dllimport) unsigned long __stdcall
- QueueUserAPC(PAPCFUNC8,void*,ulong_ptr);
+ QueueUserAPC(PAPCFUNC8,void*,ULONG_PTR_);
# ifndef UNDER_CE
     __declspec(dllimport) int __stdcall
         SetEvent(void*);
@@ -125,21 +127,20 @@
# else
     using ::SetEvent;
     using ::ResetEvent;
+# endif

- enum
- {
- infinite = (DWORD_)0xFFFFFFFF,
- wait_abandoned = 0x00000080L,
- wait_object_0 = 0x00000000L,
- wait_timeout = 0x00000102L,
- wait_failed = (DWORD_)0xFFFFFFFF
- };
+} // extern "C"
+
+ const DWORD_ infinite = (DWORD_)0xFFFFFFFF;
+ const DWORD_ wait_abandoned = 0x00000080L;
+ const DWORD_ wait_object_0 = 0x00000000L;
+ const DWORD_ wait_timeout = 0x00000102L;
+ const DWORD_ wait_failed = (DWORD_)0xFFFFFFFF;
+
+#endif // defined( BOOST_USE_WINDOWS_H )

-# endif
-}
-#endif
}
}
}

-#endif // BOOST_DETAIL_WIN_SYNCHRONIZATION_HPP
+#endif // BOOST_DETAIL_WINAPI_SYNCHRONIZATION_HPP

Modified: trunk/boost/detail/winapi/system.hpp
==============================================================================
--- trunk/boost/detail/win/system.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/system.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,19 +6,21 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_SYSTEM_HPP
-#define BOOST_DETAIL_WIN_SYSTEM_HPP
-#include <boost/config.hpp>
-#include <cstdarg>
+#ifndef BOOST_DETAIL_WINAPI_SYSTEM_HPP
+#define BOOST_DETAIL_WINAPI_SYSTEM_HPP

-#include <boost/detail/win/basic_types.hpp>
-extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *);
+#include <boost/detail/winapi/basic_types.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( BOOST_USE_WINDOWS_H )
typedef ::SYSTEM_INFO SYSTEM_INFO_;
+ extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *);
#else
extern "C" {
typedef struct _SYSTEM_INFO {
@@ -47,4 +49,4 @@
}
}
}
-#endif // BOOST_DETAIL_WIN_TIME_HPP
+#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP

Modified: trunk/boost/detail/winapi/thread.hpp
==============================================================================
--- trunk/boost/detail/win/thread.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/thread.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,17 +6,21 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_THREAD_HPP
-#define BOOST_DETAIL_WIN_THREAD_HPP
+#ifndef BOOST_DETAIL_WINAPI_THREAD_HPP
+#define BOOST_DETAIL_WINAPI_THREAD_HPP

-#include <boost/detail/win/basic_types.hpp>
-#include <boost/detail/win/GetCurrentThread.hpp>
+#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/GetCurrentThread.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
using ::GetCurrentThreadId;
@@ -42,4 +46,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_THREAD_HPP
+#endif // BOOST_DETAIL_WINAPI_THREAD_HPP

Modified: trunk/boost/detail/winapi/time.hpp
==============================================================================
--- trunk/boost/detail/win/time.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/time.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,15 +6,18 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_TIME_HPP
-#define BOOST_DETAIL_WIN_TIME_HPP
+#ifndef BOOST_DETAIL_WINAPI_TIME_HPP
+#define BOOST_DETAIL_WINAPI_TIME_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>

+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost {
namespace detail {
-namespace win32 {
+namespace winapi {
#if defined( BOOST_USE_WINDOWS_H )
typedef FILETIME FILETIME_;
typedef PFILETIME PFILETIME_;
@@ -79,4 +82,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_TIME_HPP
+#endif // BOOST_DETAIL_WINAPI_TIME_HPP

Modified: trunk/boost/detail/winapi/timers.hpp
==============================================================================
--- trunk/boost/detail/win/timers.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/detail/winapi/timers.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -6,17 +6,20 @@
// See http://www.boost.org/LICENSE_1_0.txt

-#ifndef BOOST_DETAIL_WIN_TIMERS_HPP
-#define BOOST_DETAIL_WIN_TIMERS_HPP
+#ifndef BOOST_DETAIL_WINAPI_TIMERS_HPP
+#define BOOST_DETAIL_WINAPI_TIMERS_HPP

-#include <boost/detail/win/basic_types.hpp>
+#include <boost/detail/winapi/basic_types.hpp>

+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif

namespace boost
{
namespace detail
{
-namespace win32
+namespace winapi
{
#if defined( BOOST_USE_WINDOWS_H )
using ::QueryPerformanceCounter;
@@ -38,4 +41,4 @@
}
}

-#endif // BOOST_DETAIL_WIN_TIMERS_HPP
+#endif // BOOST_DETAIL_WINAPI_TIMERS_HPP

Modified: trunk/boost/sync/detail/event/event_windows.hpp
==============================================================================
--- trunk/boost/sync/detail/event/event_windows.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/sync/detail/event/event_windows.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -12,9 +12,9 @@
#include <cstddef>
#include <boost/assert.hpp>
#include <boost/throw_exception.hpp>
-#include <boost/detail/win/GetLastError.hpp>
-#include <boost/detail/win/synchronization.hpp>
-#include <boost/detail/win/handles.hpp>
+#include <boost/detail/winapi/GetLastError.hpp>
+#include <boost/detail/winapi/synchronization.hpp>
+#include <boost/detail/winapi/handles.hpp>

#include <boost/sync/detail/config.hpp>
#include <boost/sync/exceptions/resource_error.hpp>
@@ -31,56 +31,49 @@
     BOOST_DELETED_FUNCTION(event(event const&))
     BOOST_DELETED_FUNCTION(event& operator=(event const&))

- typedef boost::detail::win32::HANDLE_ HANDLE_;
- typedef boost::detail::win32::BOOL_ BOOL_;
- typedef boost::detail::win32::DWORD_ DWORD_;
-
- static const DWORD_ infinite = (DWORD_)0xFFFFFFFF;
- static const DWORD_ wait_abandoned = 0x00000080L;
- static const DWORD_ wait_object_0 = 0x00000000L;
- static const DWORD_ wait_timeout = 0x00000102L;
- static const DWORD_ wait_failed = (DWORD_)0xFFFFFFFF;
-
+ typedef boost::detail::winapi::HANDLE_ HANDLE_;
+ typedef boost::detail::winapi::BOOL_ BOOL_;
+ typedef boost::detail::winapi::DWORD_ DWORD_;

public:
     explicit event(bool auto_reset = false)
     {
- handle_ = boost::detail::win32::CreateEventA(NULL, !auto_reset, 0, NULL);
+ handle_ = boost::detail::winapi::CreateEventA(NULL, !auto_reset, 0, NULL);
         if (!handle_)
         {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
             BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::event constructor failed in CreateEvent"));
         }
     }

     ~event() BOOST_NOEXCEPT
     {
- BOOST_VERIFY( boost::detail::win32::CloseHandle(handle_) );
+ BOOST_VERIFY( boost::detail::winapi::CloseHandle(handle_) );
     }

     void post()
     {
- const BOOL_ status = boost::detail::win32::SetEvent(handle_);
+ const BOOL_ status = boost::detail::winapi::SetEvent(handle_);
         if (status == 0)
         {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
             BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::event::post failed in ReleaseEvent"));
         }
     }

     void reset()
     {
- const BOOL_ status = boost::detail::win32::ResetEvent(handle_);
+ const BOOL_ status = boost::detail::winapi::ResetEvent(handle_);
         if (status == 0)
         {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
             BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::event::reset failed in ResetEvent"));
         }
     }

     bool wait()
     {
- using namespace boost::detail::win32;
+ using namespace boost::detail::winapi;

         switch ( WaitForSingleObject(handle_, infinite) )
         {
@@ -89,7 +82,7 @@

         case wait_failed:
             {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
                 BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::event::wait failed in WaitForSingleObject"));
             }

@@ -120,7 +113,7 @@
private:
     bool do_try_wait_for( DWORD_ milliseconds )
     {
- using namespace boost::detail::win32;
+ using namespace boost::detail::winapi;

         switch ( WaitForSingleObject(handle_, milliseconds) )
         {
@@ -132,7 +125,7 @@

         case wait_failed:
             {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
                 BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::event::do_try_wait_for failed in WaitForSingleObject"));
             }

Modified: trunk/boost/sync/detail/mutexes/mutex_windows.hpp
==============================================================================
--- trunk/boost/sync/detail/mutexes/mutex_windows.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/sync/detail/mutexes/mutex_windows.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -20,8 +20,8 @@
#include <cstddef>
#include <boost/assert.hpp>
#include <boost/throw_exception.hpp>
-#include <boost/detail/win/handles.hpp>
-#include <boost/detail/win/synchronization.hpp>
+#include <boost/detail/winapi/handles.hpp>
+#include <boost/detail/winapi/synchronization.hpp>
#include <boost/sync/exceptions/lock_error.hpp>
#include <boost/sync/exceptions/resource_error.hpp>
#include <boost/sync/detail/config.hpp>
@@ -52,7 +52,7 @@

private:
     long m_active_count;
- boost::detail::win32::HANDLE_ m_event;
+ boost::detail::winapi::HANDLE_ m_event;

public:
     BOOST_CONSTEXPR mutex() BOOST_NOEXCEPT : m_event(NULL), m_active_count(0)
@@ -62,7 +62,7 @@
     ~mutex()
     {
         if (m_event)
- BOOST_VERIFY(boost::detail::win32::CloseHandle(m_event) != 0);
+ BOOST_VERIFY(boost::detail::winapi::CloseHandle(m_event) != 0);
     }

     void lock()
@@ -76,12 +76,12 @@
         if (old_count & lock_flag_value)
         {
             bool lock_acquired = false;
- boost::detail::win32::HANDLE_ const sem = get_event();
+ boost::detail::winapi::HANDLE_ const sem = get_event();

             do
             {
- const boost::detail::win32::DWORD_ retval = boost::detail::win32::WaitForSingleObject(sem, boost::detail::win32::infinite);
- BOOST_ASSERT(0 == retval || boost::detail::win32::wait_abandoned == retval);
+ const boost::detail::winapi::DWORD_ retval = boost::detail::winapi::WaitForSingleObject(sem, boost::detail::winapi::infinite);
+ BOOST_ASSERT(0 == retval || boost::detail::winapi::wait_abandoned == retval);
                 clear_waiting_and_try_lock(old_count);
                 lock_acquired = (old_count & lock_flag_value) == 0;
             }
@@ -97,7 +97,7 @@
         {
             if (!sync::detail::windows::interlocked_bit_test_and_set(&m_active_count, event_set_flag_bit))
             {
- boost::detail::win32::SetEvent(get_event());
+ boost::detail::winapi::SetEvent(get_event());
             }
         }
     }
@@ -111,25 +111,25 @@
     BOOST_DELETED_FUNCTION(mutex& operator= (mutex const&))

private:
- boost::detail::win32::HANDLE_ get_event()
+ boost::detail::winapi::HANDLE_ get_event()
     {
- boost::detail::win32::HANDLE_ event = sync::detail::windows::interlocked_read_acquire(&m_event);
+ boost::detail::winapi::HANDLE_ event = sync::detail::windows::interlocked_read_acquire(&m_event);

         if (!event)
         {
- event = boost::detail::win32::CreateEventA(NULL, false, false, NULL);
+ event = boost::detail::winapi::CreateEventA(NULL, false, false, NULL);
#ifdef BOOST_MSVC
#pragma warning(push)
#pragma warning(disable:4311)
#pragma warning(disable:4312)
#endif
- boost::detail::win32::HANDLE_ const old_event = BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(&m_event, event, NULL);
+ boost::detail::winapi::HANDLE_ const old_event = BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(&m_event, event, NULL);
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
             if (old_event != NULL)
             {
- boost::detail::win32::CloseHandle(event);
+ boost::detail::winapi::CloseHandle(event);
                 return old_event;
             }
         }

Modified: trunk/boost/sync/detail/semaphore/semaphore_windows.hpp
==============================================================================
--- trunk/boost/sync/detail/semaphore/semaphore_windows.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/sync/detail/semaphore/semaphore_windows.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -11,9 +11,9 @@

#include <cstddef>
#include <limits>
-#include <boost/detail/win/GetLastError.hpp>
-#include <boost/detail/win/synchronization.hpp>
-#include <boost/detail/win/handles.hpp>
+#include <boost/detail/winapi/GetLastError.hpp>
+#include <boost/detail/winapi/synchronization.hpp>
+#include <boost/detail/winapi/handles.hpp>
#include <boost/throw_exception.hpp>
#include <boost/sync/detail/config.hpp>
#include <boost/sync/exceptions/resource_error.hpp>
@@ -34,41 +34,34 @@
     BOOST_DELETED_FUNCTION(semaphore(semaphore const&))
     BOOST_DELETED_FUNCTION(semaphore& operator=(semaphore const&))

- typedef boost::detail::win32::HANDLE_ HANDLE_;
- typedef boost::detail::win32::DWORD_ DWORD_;
- typedef boost::detail::win32::LONG_ LONG_;
- typedef boost::detail::win32::BOOL_ BOOL_;
-
- static const DWORD_ infinite = (DWORD_)0xFFFFFFFF;
- static const DWORD_ wait_abandoned = 0x00000080L;
- static const DWORD_ wait_object_0 = 0x00000000L;
- static const DWORD_ wait_timeout = 0x00000102L;
- static const DWORD_ wait_failed = (DWORD_)0xFFFFFFFF;
-
+ typedef boost::detail::winapi::HANDLE_ HANDLE_;
+ typedef boost::detail::winapi::DWORD_ DWORD_;
+ typedef boost::detail::winapi::LONG_ LONG_;
+ typedef boost::detail::winapi::BOOL_ BOOL_;

public:
     explicit semaphore(unsigned int i = 0)
     {
- m_sem = boost::detail::win32::CreateSemaphoreA(NULL, i, (std::numeric_limits<LONG_>::max)(), NULL);
+ m_sem = boost::detail::winapi::CreateSemaphoreA(NULL, i, (std::numeric_limits<LONG_>::max)(), NULL);
         if (!m_sem)
         {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
             BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::semaphore constructor failed in CreateSemaphore"));
         }
     }

     ~semaphore() BOOST_NOEXCEPT
     {
- int status = boost::detail::win32::CloseHandle(m_sem);
+ int status = boost::detail::winapi::CloseHandle(m_sem);
         BOOST_VERIFY (status != 0);
     }

     void post()
     {
- const BOOL_ status = boost::detail::win32::ReleaseSemaphore(m_sem, 1, NULL);
+ const BOOL_ status = boost::detail::winapi::ReleaseSemaphore(m_sem, 1, NULL);
         if (status == 0)
         {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
             BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::semaphore::post failed in ReleaseSemaphore"));
         }
     }
@@ -76,14 +69,14 @@

     bool wait()
     {
- switch (boost::detail::win32::WaitForSingleObject(m_sem, boost::detail::win32::infinite))
+ switch (boost::detail::winapi::WaitForSingleObject(m_sem, boost::detail::winapi::infinite))
         {
- case wait_object_0:
+ case boost::detail::winapi::wait_object_0:
             return true;

- case wait_failed:
+ case boost::detail::winapi::wait_failed:
             {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
                 BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::semaphore::wait failed in WaitForSingleObject"));
             }

@@ -118,17 +111,17 @@
#ifdef BOOST_SYNC_USES_CHRONO
     bool do_try_wait_for( long milliseconds )
     {
- switch (boost::detail::win32::WaitForSingleObject(m_sem, milliseconds))
+ switch (boost::detail::winapi::WaitForSingleObject(m_sem, milliseconds))
         {
- case wait_object_0:
+ case boost::detail::winapi::wait_object_0:
             return true;

- case wait_timeout:
+ case boost::detail::winapi::wait_timeout:
             return false;

- case wait_failed:
+ case boost::detail::winapi::wait_failed:
             {
- const DWORD_ err = boost::detail::win32::GetLastError();
+ const DWORD_ err = boost::detail::winapi::GetLastError();
                 BOOST_THROW_EXCEPTION(resource_error(err, "boost::sync::semaphore::do_try_wait_for failed in WaitForSingleObject"));
             }

Modified: trunk/boost/sync/detail/time_units.hpp
==============================================================================
--- trunk/boost/sync/detail/time_units.hpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/boost/sync/detail/time_units.hpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -19,7 +19,7 @@
#include <boost/sync/detail/config.hpp>

#if defined(BOOST_SYNC_DETAIL_PLATFORM_WINAPI)
-#include <boost/detail/win/time.hpp>
+#include <boost/detail/winapi/time.hpp>
#endif

#include <boost/sync/detail/header.hpp>
@@ -216,10 +216,10 @@
         union
         {
             uint64_t as_uint64;
- boost::detail::win32::FILETIME_ as_filetime;
+ boost::detail::winapi::FILETIME_ as_filetime;
         }
         caster;
- boost::detail::win32::GetSystemTimeAsFileTime(&caster.as_filetime);
+ boost::detail::winapi::GetSystemTimeAsFileTime(&caster.as_filetime);

         // Compensate the difference between 1970-Jan-01 & 1601-Jan-01
         // in 100-nanosecond intervals

Modified: trunk/libs/chrono/test/win32_test.cpp
==============================================================================
--- trunk/libs/chrono/test/win32_test.cpp Thu Sep 19 12:16:20 2013 (r85790)
+++ trunk/libs/chrono/test/win32_test.cpp 2013-09-19 13:58:24 EDT (Thu, 19 Sep 2013) (r85791)
@@ -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, ());

}

Next message: andrey.semashev_at_[hidden]: "[Boost-commit] svn:boost r85792 - trunk/libs/sync/test"
Previous message: pbristow_at_[hidden]: "[Boost-commit] svn:boost r85790 - in trunk/boost/math: distributions distributions/detail policies"

Date view	Thread view	Subject view	Author view

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