From 9678d4a3f2c2a7b8ae95c268799206fec306ac3d Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Wed, 23 Jun 2004 04:49:48 +0000 Subject: [PATCH] remove std_min and std_max, update minmax coding guidelines [SVN r23162] --- stl_concept_covering.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/stl_concept_covering.cpp b/stl_concept_covering.cpp index c9ca934..1b29b54 100644 --- a/stl_concept_covering.cpp +++ b/stl_concept_covering.cpp @@ -791,8 +791,10 @@ main() { typedef less_than_comparable_archetype<> T; T a(dummy_cons), b(dummy_cons); - const T& c = std_min(a, b); - const T& d = std_max(a, b); + BOOST_USING_STD_MIN(); + BOOST_USING_STD_MAX(); + const T& c = min BOOST_PREVENT_MACRO_SUBSTITUTION(a, b); + const T& d = max BOOST_PREVENT_MACRO_SUBSTITUTION(a, b); ignore_unused_variable_warning(c); ignore_unused_variable_warning(d); } @@ -801,8 +803,10 @@ main() binary_predicate_archetype comp(dummy_cons); typedef convertible_to_archetype T; T a(dummy_cons), b(dummy_cons); - const T& c = std_min(a, b, comp); - const T& d = std_max(a, b, comp); + BOOST_USING_STD_MIN(); + BOOST_USING_STD_MAX(); + const T& c = min BOOST_PREVENT_MACRO_SUBSTITUTION(a, b, comp); + const T& d = max BOOST_PREVENT_MACRO_SUBSTITUTION(a, b, comp); ignore_unused_variable_warning(c); ignore_unused_variable_warning(d); }