From db3dd13fb6203261e7460bc5f208f1f68b5f8839 Mon Sep 17 00:00:00 2001 From: Beman Date: Mon, 19 Jan 2015 14:09:21 -0500 Subject: [PATCH 1/8] Rename test/system directory to test/msvc --- test/{system => msvc}/common.props | 0 test/{system => msvc}/config_test/config_test.vcxproj | 0 test/{system => msvc}/error_code_test/error_code_test.vcxproj | 0 test/{system => msvc}/header_only_test/header_only_test.vcxproj | 0 test/{system => msvc}/system-dll/system-dll.vcxproj | 0 test/{system => msvc}/system.sln | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename test/{system => msvc}/common.props (100%) rename test/{system => msvc}/config_test/config_test.vcxproj (100%) rename test/{system => msvc}/error_code_test/error_code_test.vcxproj (100%) rename test/{system => msvc}/header_only_test/header_only_test.vcxproj (100%) rename test/{system => msvc}/system-dll/system-dll.vcxproj (100%) rename test/{system => msvc}/system.sln (100%) diff --git a/test/system/common.props b/test/msvc/common.props similarity index 100% rename from test/system/common.props rename to test/msvc/common.props diff --git a/test/system/config_test/config_test.vcxproj b/test/msvc/config_test/config_test.vcxproj similarity index 100% rename from test/system/config_test/config_test.vcxproj rename to test/msvc/config_test/config_test.vcxproj diff --git a/test/system/error_code_test/error_code_test.vcxproj b/test/msvc/error_code_test/error_code_test.vcxproj similarity index 100% rename from test/system/error_code_test/error_code_test.vcxproj rename to test/msvc/error_code_test/error_code_test.vcxproj diff --git a/test/system/header_only_test/header_only_test.vcxproj b/test/msvc/header_only_test/header_only_test.vcxproj similarity index 100% rename from test/system/header_only_test/header_only_test.vcxproj rename to test/msvc/header_only_test/header_only_test.vcxproj diff --git a/test/system/system-dll/system-dll.vcxproj b/test/msvc/system-dll/system-dll.vcxproj similarity index 100% rename from test/system/system-dll/system-dll.vcxproj rename to test/msvc/system-dll/system-dll.vcxproj diff --git a/test/system/system.sln b/test/msvc/system.sln similarity index 100% rename from test/system/system.sln rename to test/msvc/system.sln From 69252d03b16e08facdcbfb01d58813d76219a814 Mon Sep 17 00:00:00 2001 From: Beman Date: Mon, 19 Jan 2015 14:11:39 -0500 Subject: [PATCH 2/8] Upgrade to VC++ 14.0 2015 --- test/msvc/config_test/config_test.vcxproj | 6 +++--- test/msvc/error_code_test/error_code_test.vcxproj | 6 +++--- test/msvc/header_only_test/header_only_test.vcxproj | 6 +++--- test/msvc/system-dll/system-dll.vcxproj | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/msvc/config_test/config_test.vcxproj b/test/msvc/config_test/config_test.vcxproj index 783e989..dd29712 100644 --- a/test/msvc/config_test/config_test.vcxproj +++ b/test/msvc/config_test/config_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/test/msvc/error_code_test/error_code_test.vcxproj b/test/msvc/error_code_test/error_code_test.vcxproj index 6fb7b81..12c91cd 100644 --- a/test/msvc/error_code_test/error_code_test.vcxproj +++ b/test/msvc/error_code_test/error_code_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/test/msvc/header_only_test/header_only_test.vcxproj b/test/msvc/header_only_test/header_only_test.vcxproj index d79b68e..199b23e 100644 --- a/test/msvc/header_only_test/header_only_test.vcxproj +++ b/test/msvc/header_only_test/header_only_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/test/msvc/system-dll/system-dll.vcxproj b/test/msvc/system-dll/system-dll.vcxproj index ef799d5..aca6f00 100644 --- a/test/msvc/system-dll/system-dll.vcxproj +++ b/test/msvc/system-dll/system-dll.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ DynamicLibrary true - v120 + v140 Unicode DynamicLibrary false - v120 + v140 true Unicode From 241f69c55e923c4ccde4816031eb02d03fed409d Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 16 Nov 2015 16:42:21 +0300 Subject: [PATCH 3/8] Fix gcc warnings about unused variables --- include/boost/system/error_code.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp index 78d52fe..e7466da 100644 --- a/include/boost/system/error_code.hpp +++ b/include/boost/system/error_code.hpp @@ -218,9 +218,9 @@ namespace boost inline const error_category & get_system_category() { return system_category(); } inline const error_category & get_generic_category() { return generic_category(); } inline const error_category & get_posix_category() { return generic_category(); } - static const error_category & posix_category = generic_category(); - static const error_category & errno_ecat = generic_category(); - static const error_category & native_ecat = system_category(); + static const error_category & posix_category BOOST_ATTRIBUTE_UNUSED = generic_category(); + static const error_category & errno_ecat BOOST_ATTRIBUTE_UNUSED = generic_category(); + static const error_category & native_ecat BOOST_ATTRIBUTE_UNUSED = system_category(); # endif // class error_condition -----------------------------------------------// From 7c0e5f7c0d929d0f5c51dd99ee7fd042cdf08730 Mon Sep 17 00:00:00 2001 From: Jorge Lodos Date: Thu, 18 Feb 2016 21:49:26 -0600 Subject: [PATCH 4/8] Do not include windows.h in header only mode --- include/boost/system/detail/error_code.ipp | 30 ++++++++++--------- .../detail/local_free_on_destruction.hpp | 4 ++- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/include/boost/system/detail/error_code.ipp b/include/boost/system/detail/error_code.ipp index 71c60f6..6c9d1af 100644 --- a/include/boost/system/detail/error_code.ipp +++ b/include/boost/system/detail/error_code.ipp @@ -21,7 +21,9 @@ #include // for strerror/strerror_r # if defined( BOOST_WINDOWS_API ) -# include +# include +# include +# include # if !BOOST_PLAT_WINDOWS_RUNTIME # include # endif @@ -372,12 +374,12 @@ namespace std::wstring buf(128, wchar_t()); for (;;) { - DWORD retval = ::FormatMessageW( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, + boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageW( + boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ | + boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_, NULL, ev, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_, boost::detail::winapi::SUBLANG_DEFAULT_), // Default language &buf[0], buf.size(), NULL @@ -388,7 +390,7 @@ namespace buf.resize(retval); break; } - else if ( ::GetLastError() != ERROR_INSUFFICIENT_BUFFER ) + else if (boost::detail::winapi::GetLastError() != ERROR_INSUFFICIENT_BUFFER) { return std::string("Unknown error"); } @@ -399,22 +401,22 @@ namespace } int num_chars = (buf.size() + 1) * 2; - LPSTR narrow_buffer = (LPSTR)_alloca( num_chars ); - if (::WideCharToMultiByte(CP_ACP, 0, buf.c_str(), -1, narrow_buffer, num_chars, NULL, NULL) == 0) + boost::detail::winapi::LPSTR_ narrow_buffer = (boost::detail::winapi::LPSTR_)_alloca(num_chars); + if (boost::detail::winapi::WideCharToMultiByte(boost::detail::winapi::CP_ACP_, 0, buf.c_str(), -1, narrow_buffer, num_chars, NULL, NULL) == 0) { return std::string("Unknown error"); } std::string str( narrow_buffer ); #else - LPVOID lpMsgBuf = 0; - DWORD retval = ::FormatMessageA( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, + boost::detail::winapi::LPVOID_ lpMsgBuf = 0; + boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageA( + boost::detail::winapi::FORMAT_MESSAGE_ALLOCATE_BUFFER_ | + boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ | + boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_, NULL, ev, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_, boost::detail::winapi::SUBLANG_DEFAULT_), // Default language (LPSTR) &lpMsgBuf, 0, NULL diff --git a/include/boost/system/detail/local_free_on_destruction.hpp b/include/boost/system/detail/local_free_on_destruction.hpp index 110024f..25f879b 100644 --- a/include/boost/system/detail/local_free_on_destruction.hpp +++ b/include/boost/system/detail/local_free_on_destruction.hpp @@ -12,6 +12,8 @@ #ifndef BOOST_SYSTEM_LOCAL_FREE_ON_EXIT_HPP #define BOOST_SYSTEM_LOCAL_FREE_ON_EXIT_HPP +#include + namespace boost { namespace system { namespace detail { @@ -24,7 +26,7 @@ public: ~local_free_on_destruction() { - ::LocalFree(p_); + boost::detail::winapi::LocalFree(p_); } private: From 561ac00345dd82e2f14d3aec8aa7530a5a9c8ee3 Mon Sep 17 00:00:00 2001 From: Jorge Lodos Date: Thu, 18 Feb 2016 21:49:26 -0600 Subject: [PATCH 5/8] Do not include windows.h in header only mode --- include/boost/system/detail/error_code.ipp | 34 ++++++++++--------- .../detail/local_free_on_destruction.hpp | 4 ++- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/include/boost/system/detail/error_code.ipp b/include/boost/system/detail/error_code.ipp index 71c60f6..37d0a63 100644 --- a/include/boost/system/detail/error_code.ipp +++ b/include/boost/system/detail/error_code.ipp @@ -21,7 +21,9 @@ #include // for strerror/strerror_r # if defined( BOOST_WINDOWS_API ) -# include +# include +# include +# include # if !BOOST_PLAT_WINDOWS_RUNTIME # include # endif @@ -372,12 +374,12 @@ namespace std::wstring buf(128, wchar_t()); for (;;) { - DWORD retval = ::FormatMessageW( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, + boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageW( + boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ | + boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_, NULL, ev, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_, boost::detail::winapi::SUBLANG_DEFAULT_), // Default language &buf[0], buf.size(), NULL @@ -388,7 +390,7 @@ namespace buf.resize(retval); break; } - else if ( ::GetLastError() != ERROR_INSUFFICIENT_BUFFER ) + else if (boost::detail::winapi::GetLastError() != ERROR_INSUFFICIENT_BUFFER) { return std::string("Unknown error"); } @@ -399,23 +401,23 @@ namespace } int num_chars = (buf.size() + 1) * 2; - LPSTR narrow_buffer = (LPSTR)_alloca( num_chars ); - if (::WideCharToMultiByte(CP_ACP, 0, buf.c_str(), -1, narrow_buffer, num_chars, NULL, NULL) == 0) + boost::detail::winapi::LPSTR_ narrow_buffer = (boost::detail::winapi::LPSTR_)_alloca(num_chars); + if (boost::detail::winapi::WideCharToMultiByte(boost::detail::winapi::CP_ACP_, 0, buf.c_str(), -1, narrow_buffer, num_chars, NULL, NULL) == 0) { return std::string("Unknown error"); } std::string str( narrow_buffer ); #else - LPVOID lpMsgBuf = 0; - DWORD retval = ::FormatMessageA( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, + boost::detail::winapi::LPVOID_ lpMsgBuf = 0; + boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageA( + boost::detail::winapi::FORMAT_MESSAGE_ALLOCATE_BUFFER_ | + boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ | + boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_, NULL, ev, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPSTR) &lpMsgBuf, + boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_, boost::detail::winapi::SUBLANG_DEFAULT_), // Default language + (boost::detail::winapi::LPSTR_) &lpMsgBuf, 0, NULL ); @@ -423,7 +425,7 @@ namespace if (retval == 0) return std::string("Unknown error"); - std::string str( static_cast(lpMsgBuf) ); + std::string str(static_cast(lpMsgBuf)); # endif while ( str.size() && (str[str.size()-1] == '\n' || str[str.size()-1] == '\r') ) diff --git a/include/boost/system/detail/local_free_on_destruction.hpp b/include/boost/system/detail/local_free_on_destruction.hpp index 110024f..25f879b 100644 --- a/include/boost/system/detail/local_free_on_destruction.hpp +++ b/include/boost/system/detail/local_free_on_destruction.hpp @@ -12,6 +12,8 @@ #ifndef BOOST_SYSTEM_LOCAL_FREE_ON_EXIT_HPP #define BOOST_SYSTEM_LOCAL_FREE_ON_EXIT_HPP +#include + namespace boost { namespace system { namespace detail { @@ -24,7 +26,7 @@ public: ~local_free_on_destruction() { - ::LocalFree(p_); + boost::detail::winapi::LocalFree(p_); } private: From 388b3497af4b205ff7e8c67ea306f57eea629ae3 Mon Sep 17 00:00:00 2001 From: Beman Date: Tue, 23 Feb 2016 10:58:27 -0500 Subject: [PATCH 6/8] Revert the prior change (do not include windows.h). It worked fine with the msvc toolset, testing with the last four VC++ versions. But it failed with GCC version 4.9.3 cygwin64. --- include/boost/system/detail/error_code.ipp | 34 +++++++++---------- .../detail/local_free_on_destruction.hpp | 4 +-- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/include/boost/system/detail/error_code.ipp b/include/boost/system/detail/error_code.ipp index 37d0a63..71c60f6 100644 --- a/include/boost/system/detail/error_code.ipp +++ b/include/boost/system/detail/error_code.ipp @@ -21,9 +21,7 @@ #include // for strerror/strerror_r # if defined( BOOST_WINDOWS_API ) -# include -# include -# include +# include # if !BOOST_PLAT_WINDOWS_RUNTIME # include # endif @@ -374,12 +372,12 @@ namespace std::wstring buf(128, wchar_t()); for (;;) { - boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageW( - boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ | - boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_, + DWORD retval = ::FormatMessageW( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, NULL, ev, - boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_, boost::detail::winapi::SUBLANG_DEFAULT_), // Default language + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language &buf[0], buf.size(), NULL @@ -390,7 +388,7 @@ namespace buf.resize(retval); break; } - else if (boost::detail::winapi::GetLastError() != ERROR_INSUFFICIENT_BUFFER) + else if ( ::GetLastError() != ERROR_INSUFFICIENT_BUFFER ) { return std::string("Unknown error"); } @@ -401,23 +399,23 @@ namespace } int num_chars = (buf.size() + 1) * 2; - boost::detail::winapi::LPSTR_ narrow_buffer = (boost::detail::winapi::LPSTR_)_alloca(num_chars); - if (boost::detail::winapi::WideCharToMultiByte(boost::detail::winapi::CP_ACP_, 0, buf.c_str(), -1, narrow_buffer, num_chars, NULL, NULL) == 0) + LPSTR narrow_buffer = (LPSTR)_alloca( num_chars ); + if (::WideCharToMultiByte(CP_ACP, 0, buf.c_str(), -1, narrow_buffer, num_chars, NULL, NULL) == 0) { return std::string("Unknown error"); } std::string str( narrow_buffer ); #else - boost::detail::winapi::LPVOID_ lpMsgBuf = 0; - boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageA( - boost::detail::winapi::FORMAT_MESSAGE_ALLOCATE_BUFFER_ | - boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ | - boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_, + LPVOID lpMsgBuf = 0; + DWORD retval = ::FormatMessageA( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, NULL, ev, - boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_, boost::detail::winapi::SUBLANG_DEFAULT_), // Default language - (boost::detail::winapi::LPSTR_) &lpMsgBuf, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + (LPSTR) &lpMsgBuf, 0, NULL ); @@ -425,7 +423,7 @@ namespace if (retval == 0) return std::string("Unknown error"); - std::string str(static_cast(lpMsgBuf)); + std::string str( static_cast(lpMsgBuf) ); # endif while ( str.size() && (str[str.size()-1] == '\n' || str[str.size()-1] == '\r') ) diff --git a/include/boost/system/detail/local_free_on_destruction.hpp b/include/boost/system/detail/local_free_on_destruction.hpp index 25f879b..110024f 100644 --- a/include/boost/system/detail/local_free_on_destruction.hpp +++ b/include/boost/system/detail/local_free_on_destruction.hpp @@ -12,8 +12,6 @@ #ifndef BOOST_SYSTEM_LOCAL_FREE_ON_EXIT_HPP #define BOOST_SYSTEM_LOCAL_FREE_ON_EXIT_HPP -#include - namespace boost { namespace system { namespace detail { @@ -26,7 +24,7 @@ public: ~local_free_on_destruction() { - boost::detail::winapi::LocalFree(p_); + ::LocalFree(p_); } private: From af1f767dfe2964760cd40bbce0b721642ecb9758 Mon Sep 17 00:00:00 2001 From: Beman Date: Mon, 28 Nov 2016 08:32:26 -0500 Subject: [PATCH 7/8] Comment two lines of code to try to prevent user confusion error_codes and error_conditions, such exhibited by ticket #12574. --- include/boost/system/error_code.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp index e7466da..9e25a7d 100644 --- a/include/boost/system/error_code.hpp +++ b/include/boost/system/error_code.hpp @@ -39,8 +39,9 @@ namespace boost namespace system { - class error_code; - class error_condition; + class error_code; // values defined by the operating system + class error_condition; // portable generic values defined below, but ultimately + // based on the POSIX standard // "Concept" helpers ---------------------------------------------------// From dc985cb3bc23e85ba85037660675b272e77872d3 Mon Sep 17 00:00:00 2001 From: Beman Date: Mon, 23 Jan 2017 17:08:17 -0500 Subject: [PATCH 8/8] Clean up some sloppy include guards that were clashing with other Boost projects --- include/boost/cerrno.hpp | 4 ++-- include/boost/system/cygwin_error.hpp | 6 +++--- include/boost/system/error_code.hpp | 6 +++--- include/boost/system/linux_error.hpp | 6 +++--- include/boost/system/system_error.hpp | 6 +++--- include/boost/system/windows_error.hpp | 6 +++--- test/msvc/config_test/config_test.vcxproj | 9 +++++++++ 7 files changed, 26 insertions(+), 17 deletions(-) diff --git a/include/boost/cerrno.hpp b/include/boost/cerrno.hpp index 6f26698..57278f5 100644 --- a/include/boost/cerrno.hpp +++ b/include/boost/cerrno.hpp @@ -7,8 +7,8 @@ // See library home page at http://www.boost.org/libs/system -#ifndef BOOST_CERRNO_HPP -#define BOOST_CERRNO_HPP +#ifndef BOOST_SYSTEM_CERRNO_HPP +#define BOOST_SYSTEM_CERRNO_HPP #include diff --git a/include/boost/system/cygwin_error.hpp b/include/boost/system/cygwin_error.hpp index ea3528b..4f91cf3 100644 --- a/include/boost/system/cygwin_error.hpp +++ b/include/boost/system/cygwin_error.hpp @@ -7,8 +7,8 @@ // See library home page at http://www.boost.org/libs/system -#ifndef BOOST_CYGWIN_ERROR_HPP -#define BOOST_CYGWIN_ERROR_HPP +#ifndef BOOST_SYSTEM_CYGWIN_ERROR_HPP +#define BOOST_SYSTEM_CYGWIN_ERROR_HPP // This header is effectively empty for compiles on operating systems where // it is not applicable. @@ -53,4 +53,4 @@ namespace boost #endif // __CYGWIN__ -#endif // BOOST_CYGWIN_ERROR_HPP +#endif // BOOST_SYSTEM_CYGWIN_ERROR_HPP diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp index 9e25a7d..6ec444f 100644 --- a/include/boost/system/error_code.hpp +++ b/include/boost/system/error_code.hpp @@ -8,8 +8,8 @@ // See library home page at http://www.boost.org/libs/system -#ifndef BOOST_ERROR_CODE_HPP -#define BOOST_ERROR_CODE_HPP +#ifndef BOOST_SYSTEM_ERROR_CODE_HPP +#define BOOST_SYSTEM_ERROR_CODE_HPP #include #include @@ -530,6 +530,6 @@ namespace boost # include # endif -#endif // BOOST_ERROR_CODE_HPP +#endif // BOOST_SYSTEM_ERROR_CODE_HPP diff --git a/include/boost/system/linux_error.hpp b/include/boost/system/linux_error.hpp index 0eb22bf..0873a7c 100644 --- a/include/boost/system/linux_error.hpp +++ b/include/boost/system/linux_error.hpp @@ -7,8 +7,8 @@ // See library home page at http://www.boost.org/libs/system -#ifndef BOOST_LINUX_ERROR_HPP -#define BOOST_LINUX_ERROR_HPP +#ifndef BOOST_SYSTEM_LINUX_ERROR_HPP +#define BOOST_SYSTEM_LINUX_ERROR_HPP // This header is effectively empty for compiles on operating systems where // it is not applicable. @@ -107,4 +107,4 @@ namespace boost #endif // Linux -#endif // BOOST_LINUX_ERROR_HPP +#endif // BOOST_SYSTEM_LINUX_ERROR_HPP diff --git a/include/boost/system/system_error.hpp b/include/boost/system/system_error.hpp index b306aae..d98b4bc 100644 --- a/include/boost/system/system_error.hpp +++ b/include/boost/system/system_error.hpp @@ -5,8 +5,8 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_SYSTEM_ERROR_HPP -#define BOOST_SYSTEM_ERROR_HPP +#ifndef BOOST_SYSTEM_SYSTEM_ERROR_HPP +#define BOOST_SYSTEM_SYSTEM_ERROR_HPP #include #include @@ -79,6 +79,6 @@ namespace boost } // namespace system } // namespace boost -#endif // BOOST_SYSTEM_ERROR_HPP +#endif // BOOST_SYSTEM_SYSTEM_ERROR_HPP diff --git a/include/boost/system/windows_error.hpp b/include/boost/system/windows_error.hpp index 9d9d206..38d6284 100644 --- a/include/boost/system/windows_error.hpp +++ b/include/boost/system/windows_error.hpp @@ -7,8 +7,8 @@ // See library home page at http://www.boost.org/libs/system -#ifndef BOOST_WINDOWS_ERROR_HPP -#define BOOST_WINDOWS_ERROR_HPP +#ifndef BOOST_SYSTEM_WINDOWS_ERROR_HPP +#define BOOST_SYSTEM_WINDOWS_ERROR_HPP // This header is effectively empty for compiles on operating systems where // it is not applicable. @@ -123,4 +123,4 @@ namespace boost #endif // BOOST_WINDOWS_API -#endif // BOOST_WINDOWS_ERROR_HPP +#endif // BOOST_SYSTEM_WINDOWS_ERROR_HPP diff --git a/test/msvc/config_test/config_test.vcxproj b/test/msvc/config_test/config_test.vcxproj index dd29712..396f312 100644 --- a/test/msvc/config_test/config_test.vcxproj +++ b/test/msvc/config_test/config_test.vcxproj @@ -82,6 +82,15 @@ + + + + + + + + +