mirror of
https://github.com/boostorg/regex.git
synced 2025-07-13 04:16:37 +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_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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user