From a0a7411e333238ee27cd954f427669560d147b7a Mon Sep 17 00:00:00 2001 From: Mikael Olenfalk Date: Thu, 20 Aug 2015 14:34:56 +0200 Subject: [PATCH] Fix macro redefinition warning in VS2015 Fixes: https://svn.boost.org/trac/boost/ticket/11539 --- include/boost/asio/detail/config.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/boost/asio/detail/config.hpp b/include/boost/asio/detail/config.hpp index 0f9e52d5..cc01e8ea 100644 --- a/include/boost/asio/detail/config.hpp +++ b/include/boost/asio/detail/config.hpp @@ -221,8 +221,7 @@ # define BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT noexcept(true) # endif // defined(__GXX_EXPERIMENTAL_CXX0X__) # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) -# endif // defined(__GNUC__) -# if defined(BOOST_ASIO_MSVC) +# elif defined(BOOST_ASIO_MSVC) # if (_MSC_VER >= 1900) # define BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT noexcept(true) # endif // (_MSC_VER >= 1900)