[Boost-commit] svn:boost r86152 - in trunk: boost/asio/detail libs/system/src

Subject: [Boost-commit] svn:boost r86152 - in trunk: boost/asio/detail libs/system/src
From: chris_at_[hidden]
Date: 2013-10-03 19:59:54

Author: chris_kohlhoff
Date: 2013-10-03 19:59:54 EDT (Thu, 03 Oct 2013)
New Revision: 86152
URL: http://svn.boost.org/trac/boost/changeset/86152

Log:
Fix WinRT detection.

Text files modified: 
   trunk/boost/asio/detail/config.hpp   |    13 +++++++------                           
   trunk/libs/system/src/error_code.cpp |     4 ++--                                    
   2 files changed, 9 insertions(+), 8 deletions(-)

Modified: trunk/boost/asio/detail/config.hpp
==============================================================================
--- trunk/boost/asio/detail/config.hpp	Thu Oct  3 18:59:24 2013	(r86151)
+++ trunk/boost/asio/detail/config.hpp	2013-10-03 19:59:54 EDT (Thu, 03 Oct 2013)	(r86152)
@@ -454,11 +454,12 @@
 
 // WinRT target.
 #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
-# if defined(WINAPI_FAMILY)
-#  if ((WINAPI_FAMILY & WINAPI_PARTITION_APP) != 0)
+# if defined(__cplusplus_winrt)
+#  include <winapifamily.h>
+#  if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
 #   define BOOST_ASIO_WINDOWS_RUNTIME 1
-#  endif // ((WINAPI_FAMILY & WINAPI_PARTITION_APP) != 0)
-# endif // defined(WINAPI_FAMILY)
+#  endif // WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+# endif // defined(__cplusplus_winrt)
 #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
 
 // Windows target. Excludes WinRT.
@@ -869,12 +870,12 @@
 #   endif // ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)
 #  endif // defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
 # endif // defined(__linux__)
-# if defined(BOOST_ASIO_MSVC) && defined(WINAPI_FAMILY)
+# if defined(BOOST_ASIO_MSVC) && defined(BOOST_ASIO_WINDOWS_RUNTIME)
 #  if (_MSC_VER >= 1700)
 #   define BOOST_ASIO_HAS_THREAD_KEYWORD_EXTENSION 1
 #   define BOOST_ASIO_THREAD_KEYWORD __declspec(thread)
 #  endif // (_MSC_VER >= 1700)
-# endif // defined(BOOST_ASIO_MSVC) && defined(WINAPI_FAMILY)
+# endif // defined(BOOST_ASIO_MSVC) && defined(BOOST_ASIO_WINDOWS_RUNTIME)
 #endif // !defined(BOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION)
 #if !defined(BOOST_ASIO_THREAD_KEYWORD)
 # define BOOST_ASIO_THREAD_KEYWORD __thread

Modified: trunk/libs/system/src/error_code.cpp
==============================================================================
--- trunk/libs/system/src/error_code.cpp	Thu Oct  3 18:59:24 2013	(r86151)
+++ trunk/libs/system/src/error_code.cpp	2013-10-03 19:59:54 EDT (Thu, 03 Oct 2013)	(r86152)
@@ -26,7 +26,7 @@
 
 # if defined( BOOST_WINDOWS_API )
 #   include <windows.h>
-#   if !defined(WINAPI_FAMILY) || ((WINAPI_FAMILY & WINAPI_PARTITION_APP) == 0)
+#   if !defined(WINAPI_FAMILY) || ((WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP) != 0)
 #     include "local_free_on_destruction.hpp"
 #   endif
 #   ifndef ERROR_INCORRECT_SIZE
@@ -372,7 +372,7 @@
 
   std::string system_error_category::message( int ev ) const
   {
-# if defined(WINAPI_FAMILY) && ((WINAPI_FAMILY & WINAPI_PARTITION_APP) != 0)
+# if defined(WINAPI_FAMILY) && ((WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP) == 0)
     std::string str( 128, char() );
     for (;;)
     {