From 217fa37de2cbe8a58c0d2128e4b731f687981d03 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 7 Feb 2008 10:13:31 +0000 Subject: [PATCH] Fix min/max usage violation. [SVN r43145] --- test/common_factor_test.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/common_factor_test.cpp b/test/common_factor_test.cpp index fcd2034..c78b99b 100644 --- a/test/common_factor_test.cpp +++ b/test/common_factor_test.cpp @@ -129,6 +129,7 @@ typedef ::boost::mpl::list 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 @@ class numeric_limits< MyUnsigned1 > 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);