From 067ff613b3b5a15403c208269a3c5bc3726050f3 Mon Sep 17 00:00:00 2001 From: Christopher Kohlhoff Date: Sat, 26 Oct 2013 23:25:53 +0000 Subject: [PATCH] Merge from trunk. ------------------------------------------------------------------------ r86152 | chris_kohlhoff | 2013-10-04 09:59:54 +1000 (Fri, 04 Oct 2013) | 1 line Fix WinRT detection. ------------------------------------------------------------------------ r86153 | chris_kohlhoff | 2013-10-04 10:00:46 +1000 (Fri, 04 Oct 2013) | 1 line Add WinRT implementation notes. ------------------------------------------------------------------------ r86154 | chris_kohlhoff | 2013-10-04 10:03:36 +1000 (Fri, 04 Oct 2013) | 1 line Fix dead links in documentation. ------------------------------------------------------------------------ r86462 | chris_kohlhoff | 2013-10-27 09:32:01 +1100 (Sun, 27 Oct 2013) | 1 line Suppress conversion warnings reported by MSVC. ------------------------------------------------------------------------ r86463 | chris_kohlhoff | 2013-10-27 09:35:32 +1100 (Sun, 27 Oct 2013) | 1 line Support older versions of OpenSSL that don't supply SSL_CTX_clear_options. ------------------------------------------------------------------------ r86464 | chris_kohlhoff | 2013-10-27 09:39:23 +1100 (Sun, 27 Oct 2013) | 1 line Add a note to clarify that concurrent invocation is not guaranteed for handlers in different strands. ------------------------------------------------------------------------ r86465 | chris_kohlhoff | 2013-10-27 09:42:53 +1100 (Sun, 27 Oct 2013) | 1 line Fix typos in spawn() documentation. ------------------------------------------------------------------------ r86468 | chris_kohlhoff | 2013-10-27 09:49:17 +1100 (Sun, 27 Oct 2013) | 1 line Updated revision history. ------------------------------------------------------------------------ [SVN r86470] --- src/error_code.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/error_code.cpp b/src/error_code.cpp index 68cb6ed..5e00588 100644 --- a/src/error_code.cpp +++ b/src/error_code.cpp @@ -26,7 +26,7 @@ # if defined( BOOST_WINDOWS_API ) # include -# 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 @@ namespace 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 (;;) {