Made min/max usage conform to our guidelines.

Changed Boost.test usage to conform to new interface.


[SVN r27271]
This commit is contained in:
John Maddock
2005-02-09 12:33:18 +00:00
parent 1df0b9cacd
commit eff6f06792
7 changed files with 16 additions and 28 deletions

View File

@ -45,7 +45,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 +86,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;
}

View File

@ -48,7 +48,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 +94,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;
}

View File

@ -45,7 +45,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 +86,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;
}

View File

@ -69,7 +69,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 +152,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;
}

View File

@ -50,7 +50,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 +116,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;
}

View File

@ -49,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;
}
@ -96,7 +96,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;
}