[Boost-commit] svn:boost r43146 - branches/release/libs/math/test

From: john_at_[hidden]
Date: 2008-02-07 05:15:36

Author: johnmaddock
Date: 2008-02-07 05:15:35 EST (Thu, 07 Feb 2008)
New Revision: 43146
URL: http://svn.boost.org/trac/boost/changeset/43146

Log:
Merge fix for min/max usage violation.
Text files modified: 
   branches/release/libs/math/test/common_factor_test.cpp |     9 +++++----                               
   1 files changed, 5 insertions(+), 4 deletions(-)

Modified: branches/release/libs/math/test/common_factor_test.cpp
==============================================================================
--- branches/release/libs/math/test/common_factor_test.cpp	(original)
+++ branches/release/libs/math/test/common_factor_test.cpp	2008-02-07 05:15:35 EST (Thu, 07 Feb 2008)
@@ -129,6 +129,7 @@
 
 }  // namespace
 
+#define BOOST_NO_MACRO_EXPAND /**/
 
 // Specialize numeric_limits for _some_ of our types
 namespace std
@@ -143,8 +144,8 @@
 public:
     BOOST_STATIC_CONSTANT(bool, is_specialized = limits_type::is_specialized);
 
-    static MyInt1 min() throw()  { return limits_type::min(); }
-    static MyInt1 max() throw()  { return limits_type::max(); }
+    static MyInt1 min BOOST_NO_MACRO_EXPAND() throw()  { return (limits_type::min)(); }
+    static MyInt1 max BOOST_NO_MACRO_EXPAND() throw()  { return (limits_type::max)(); }
 
     BOOST_STATIC_CONSTANT(int, digits      = limits_type::digits);
     BOOST_STATIC_CONSTANT(int, digits10    = limits_type::digits10);
@@ -190,8 +191,8 @@
 public:
     BOOST_STATIC_CONSTANT(bool, is_specialized = limits_type::is_specialized);
 
-    static MyUnsigned1 min() throw()  { return limits_type::min(); }
-    static MyUnsigned1 max() throw()  { return limits_type::max(); }
+    static MyUnsigned1 min BOOST_NO_MACRO_EXPAND() throw()  { return (limits_type::min)(); }
+    static MyUnsigned1 max BOOST_NO_MACRO_EXPAND() throw()  { return (limits_type::max)(); }
 
     BOOST_STATIC_CONSTANT(int, digits      = limits_type::digits);
     BOOST_STATIC_CONSTANT(int, digits10    = limits_type::digits10);