From 53c2862a77db6ae45dc0efc4285967d422126665 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Fri, 1 Dec 2000 17:11:40 +0000 Subject: [PATCH] Avoid spurious MSVC NOMINMAX redefinition warning (submitted by Andreas Scherer) [SVN r8377] --- include/boost/config.hpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/include/boost/config.hpp b/include/boost/config.hpp index a9b8366c..b74654f9 100644 --- a/include/boost/config.hpp +++ b/include/boost/config.hpp @@ -318,14 +318,17 @@ # define BOOST_NO_HASH # define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS # define BOOST_NO_STD_ALLOCATOR -#ifndef _CPPLIB_VER - // Updated Dinkum library defines this, and provides - // its own min and max definitions. -# define BOOST_NO_STD_MIN_MAX -# undef min -# undef max -#endif -# define NOMINMAX +# ifndef _CPPLIB_VER + // Updated Dinkum library defines this, and provides + // its own min and max definitions. +# define BOOST_NO_STD_MIN_MAX +# undef min +# undef max +# endif +# ifndef NOMINMAX + // avoid spurious NOMINMAX redefinition warning +# define NOMINMAX +# endif # endif # define BOOST_NO_STD_ITERATOR_TRAITS