Merge fixes from Trunk - mainly warning suppression.

[SVN r65720]
This commit is contained in:
John Maddock
2010-10-02 11:34:33 +00:00
parent 09c9e93572
commit cfedb49110
132 changed files with 4159 additions and 3739 deletions

View File

@ -73,6 +73,14 @@ void test_match(const std::string& re, const std::string& text, const std::strin
r.xpressive_time = time;
std::cout << "\txpressive regex: " << time << "s\n";
}
#endif
#ifndef BOOST_NO_0X_HDR_REGEX
if(time_std == true)
{
time = stdr::time_match(re, text, icase);
r.std_time = time;
std::cout << "\tstd::regex: " << time << "s\n";
}
#endif
r.finalise();
result_list.push_back(r);
@ -134,6 +142,14 @@ void test_find_all(const std::string& re, const std::string& text, const std::st
r.xpressive_time = time;
std::cout << "\txpressive regex: " << time << "s\n";
}
#endif
#ifndef BOOST_NO_0X_HDR_REGEX
if(time_std == true)
{
time = stdr::time_find_all(re, text, icase);
r.std_time = time;
std::cout << "\tstd::regex: " << time << "s\n";
}
#endif
r.finalise();
result_list.push_back(r);