forked from boostorg/config
Avoid spurious MSVC NOMINMAX redefinition warning (submitted by Andreas Scherer)
[SVN r8377]
This commit is contained in:
@@ -318,15 +318,18 @@
|
|||||||
# 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
|
||||||
|
# ifndef NOMINMAX
|
||||||
|
// avoid spurious NOMINMAX redefinition warning
|
||||||
# define NOMINMAX
|
# define NOMINMAX
|
||||||
# endif
|
# endif
|
||||||
|
# endif
|
||||||
# define BOOST_NO_STD_ITERATOR_TRAITS
|
# define BOOST_NO_STD_ITERATOR_TRAITS
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user