remove minmax hack from win32.hpp and fix all places that could be affected by the minmax macros

[SVN r22394]

performance/regex_comparison.hpp

@@ -63,7 +63,7 @@ struct results
         safe_greta_time(-1),
         posix_time(-1),
         pcre_time(-1),
-        factor(std::numeric_limits<double>::max()),
+        factor((std::numeric_limits<double>::max)()),
         expression(ex), 
         description(desc)
    {}

performance/time_boost.cpp

@@ -9,6 +9,7 @@
  *
  */
 
+#include <boost/minmax.hpp>
 #include "regex_comparison.hpp"
 #include <boost/timer.hpp>
 #include <boost/regex.hpp>
@@ -45,7 +46,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          boost::regex_match(text, what, e);
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }
@@ -86,7 +87,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          boost::regex_grep(&dummy_grep_proc, text, e);
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }

performance/time_greta.cpp

@@ -9,6 +9,7 @@
  *
  */
 
+#include <boost/minmax.hpp>
 #include "regex_comparison.hpp"
 #if defined(BOOST_HAS_GRETA)
 #include <cassert>
@@ -48,7 +49,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          e.match(text, what);
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }
@@ -94,7 +95,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }

performance/time_localised_boost.cpp

@@ -12,6 +12,7 @@
 #include "regex_comparison.hpp"
 #include <boost/timer.hpp>
 #include <boost/regex.hpp>
+#include <boost/minmax.hpp>
 
 namespace bl{
 
@@ -45,7 +46,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          boost::regex_match(text, what, e);
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }
@@ -86,7 +87,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          boost::regex_grep(&dummy_grep_proc, text, e);
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }

performance/time_pcre.cpp

@@ -11,6 +11,7 @@
 
 #include <cassert>
 #include <cfloat>
+#include <boost/minmax.hpp>
 #include "regex_comparison.hpp"
 #ifdef BOOST_HAS_PCRE
 #include "pcre.h"
@@ -69,7 +70,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          erroffset = pcre_exec(ppcre, pe, text.c_str(), text.size(), 0, 0, what, sizeof(what)/sizeof(int));
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    free(ppcre);
    free(pe);
@@ -152,7 +153,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }

performance/time_posix.cpp

@@ -11,6 +11,7 @@
 
 #include <cassert>
 #include <cfloat>
+#include <boost/minmax.hpp>
 #include "regex_comparison.hpp"
 #ifdef BOOST_HAS_POSIX
 #include <boost/timer.hpp>
@@ -50,7 +51,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          regexec(&e, text.c_str(), e.re_nsub, what, 0);
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    regfree(&e);
    return result / iter;
@@ -116,7 +117,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }

performance/time_safe_greta.cpp

@@ -14,6 +14,7 @@
 
 #include <cassert>
 #include <boost/timer.hpp>
+#include <boost/minmax.hpp>
 #include "regexpr2.h"
 
 namespace gs{
@@ -49,7 +50,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          e.match(text, what);
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }
@@ -96,7 +97,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = std::min(run, result);
+      result = std_min(run, result);
    }
    return result / iter;
 }