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

[SVN r22394]
This commit is contained in:
Eric Niebler
2004-02-26 18:27:02 +00:00
parent 50b8204753
commit 3075aaba4a
12 changed files with 34 additions and 24 deletions

View File

@ -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;
}