From 1b8f363e9004a6cd111e04a48eaefcf06da03210 Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Thu, 26 Feb 2004 18:27:02 +0000 Subject: [PATCH] remove minmax hack from win32.hpp and fix all places that could be affected by the minmax macros [SVN r22394] --- stl_concept_covering.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stl_concept_covering.cpp b/stl_concept_covering.cpp index 365f4a3..c9ca934 100644 --- a/stl_concept_covering.cpp +++ b/stl_concept_covering.cpp @@ -8,6 +8,7 @@ #include #include #include +#include /* @@ -790,8 +791,8 @@ 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); + const T& c = std_min(a, b); + const T& d = std_max(a, b); ignore_unused_variable_warning(c); ignore_unused_variable_warning(d); } @@ -800,8 +801,8 @@ 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); + const T& c = std_min(a, b, comp); + const T& d = std_max(a, b, comp); ignore_unused_variable_warning(c); ignore_unused_variable_warning(d); }