Avoid spurious MSVC NOMINMAX redefinition warning (submitted by Andreas Scherer)

[SVN r8377]
This commit is contained in:
Beman Dawes
2000-12-01 17:11:40 +00:00
parent aea3b88265
commit 53c2862a77

View File

@@ -318,14 +318,17 @@
# define BOOST_NO_HASH # define BOOST_NO_HASH
# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS # define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
# define BOOST_NO_STD_ALLOCATOR # define BOOST_NO_STD_ALLOCATOR
#ifndef _CPPLIB_VER # ifndef _CPPLIB_VER
// Updated Dinkum library defines this, and provides // Updated Dinkum library defines this, and provides
// its own min and max definitions. // its own min and max definitions.
# define BOOST_NO_STD_MIN_MAX # define BOOST_NO_STD_MIN_MAX
# undef min # undef min
# undef max # undef max
#endif # endif
# define NOMINMAX # ifndef NOMINMAX
// avoid spurious NOMINMAX redefinition warning
# define NOMINMAX
# endif
# endif # endif
# define BOOST_NO_STD_ITERATOR_TRAITS # define BOOST_NO_STD_ITERATOR_TRAITS