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:
@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user