mirror of
https://github.com/boostorg/regex.git
synced 2025-07-12 20:06:38 +02:00
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:
@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user