forked from boostorg/regex
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:
@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user