Moved definition of NOMINMAX to win32.hpp

[SVN r14546]
This commit is contained in:
John Maddock
2002-07-20 12:06:05 +00:00
parent 5c7f8b9290
commit 5406c65596
3 changed files with 13 additions and 18 deletions

View File

@@ -19,9 +19,6 @@
# define BOOST_NO_VOID_RETURNS # define BOOST_NO_VOID_RETURNS
// disable min/max macro defines on vc6: // disable min/max macro defines on vc6:
// //
# ifndef NOMINMAX
# define NOMINMAX
# endif
#endif #endif
#if (_MSC_VER <= 1300) // || !defined(BOOST_STRICT_CONFIG) // VC7 Beta 2 or later #if (_MSC_VER <= 1300) // || !defined(BOOST_STRICT_CONFIG) // VC7 Beta 2 or later
@@ -50,15 +47,6 @@
# define BOOST_NO_TEMPLATE_TEMPLATES # define BOOST_NO_TEMPLATE_TEMPLATES
# if (_MSC_VER > 1200) # if (_MSC_VER > 1200)
# define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS # define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
# endif
//
// disable min/max macros if defined:
//
# ifdef min
# undef min
# endif
# ifdef max
# undef max
# endif # endif
#endif #endif

View File

@@ -37,3 +37,16 @@
#define BOOST_HAS_FTIME #define BOOST_HAS_FTIME
#endif #endif
//
// disable min/max macros:
//
#ifdef min
# undef min
#endif
#ifdef max
# undef max
#endif
#ifndef NOMINMAX
# define NOMINMAX
#endif

View File

@@ -46,14 +46,8 @@
// 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 max
# define BOOST_NO_MS_INT64_NUMERIC_LIMITS # define BOOST_NO_MS_INT64_NUMERIC_LIMITS
# endif # endif
# ifndef NOMINMAX
// avoid spurious NOMINMAX redefinition warning
# define NOMINMAX
# endif
#endif #endif
#if defined(_MSC_VER) && (_MSC_VER <= 1200) || !defined(_CPPLIB_VER) || _CPPLIB_VER < 306 #if defined(_MSC_VER) && (_MSC_VER <= 1200) || !defined(_CPPLIB_VER) || _CPPLIB_VER < 306