From 688955ab9b1e022a49c027a8fc6f56ada3ff8e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Sun, 23 Feb 2014 21:31:52 +0100 Subject: [PATCH] Fixes #9482 --- doc/move.qbk | 3 ++- include/boost/move/detail/config_end.hpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/move.qbk b/doc/move.qbk index f7fcd29..07573f7 100644 --- a/doc/move.qbk +++ b/doc/move.qbk @@ -757,7 +757,8 @@ Many thanks to all boosters that have tested, reviewed and improved the library. [section:release_notes_boost_1_56_00 Boost 1.56 Release] -* Added [macroref BOOST_MOVE_RET BOOST_MOVE_RET]. +* Added [macroref BOOST_MOVE_RET BOOST_MOVE_RET]. +* Fixed bug [@https://svn.boost.org/trac/boost/ticket/9482 #9482: ['"MSVC macros not undefined in boost/move/detail/config_end.hpp"]]. [endsect] diff --git a/include/boost/move/detail/config_end.hpp b/include/boost/move/detail/config_end.hpp index c43bce0..5f83231 100644 --- a/include/boost/move/detail/config_end.hpp +++ b/include/boost/move/detail/config_end.hpp @@ -9,11 +9,11 @@ ////////////////////////////////////////////////////////////////////////////// #if defined BOOST_MSVC #pragma warning (pop) - #ifdef BOOST_MOVE_DETAIL_CRT_SECURE_NO_DEPRECATE - #undef BOOST_MOVE_DETAIL_CRT_SECURE_NO_DEPRECATE + #ifdef BOOST_MOVE_CRT_SECURE_NO_DEPRECATE + #undef BOOST_MOVE_CRT_SECURE_NO_DEPRECATE #undef _CRT_SECURE_NO_DEPRECATE #endif - #ifndef BOOST_MOVE_SCL_SECURE_NO_WARNINGS + #ifdef BOOST_MOVE_SCL_SECURE_NO_WARNINGS #undef BOOST_MOVE_SCL_SECURE_NO_WARNINGS #undef _SCL_SECURE_NO_WARNINGS #endif