feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Switch from deprecated macros to new shiny ones; no functionality change

Browse Source 
[SVN r79418]
This commit is contained in:
Marshall Clow
2012-07-11 16:21:55 +00:00
parent c2d2f656da
commit 4ab0ffee0a
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
performance/command_line.cpp
View File

@ -90,7 +90,7 @@ int handle_argument(const std::string& what)
else if(what == "-xpressive" || what == "-dxpr") else if(what == "-xpressive" || what == "-dxpr")
time_xpressive = true; time_xpressive = true;
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
else if(what == "-std") else if(what == "-std")
time_std = true; time_std = true;
#endif #endif
@ -111,7 +111,7 @@ int handle_argument(const std::string& what)
#ifdef BOOST_HAS_XPRESSIVE #ifdef BOOST_HAS_XPRESSIVE
time_xpressive = true; time_xpressive = true;
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
time_std = true; time_std = true;
#endif #endif
} }
@ -177,7 +177,7 @@ int show_usage()
#ifdef BOOST_HAS_XPRESSIVE #ifdef BOOST_HAS_XPRESSIVE
" -dxpr Apply tests to dynamic xpressive library\n" " -dxpr Apply tests to dynamic xpressive library\n"
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
" -std Apply tests to std::regex.\n" " -std Apply tests to std::regex.\n"
#endif #endif
" -all Apply tests to all libraries\n\n" " -all Apply tests to all libraries\n\n"
@ -287,7 +287,7 @@ void output_html_results(bool show_description, const std::string& tagname)
if(time_xpressive == true) if(time_xpressive == true)
os << "<td><strong>Dynamic Xpressive</strong></td>"; os << "<td><strong>Dynamic Xpressive</strong></td>";
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true) if(time_std == true)
os << "<td><strong>std::regex</strong></td>"; os << "<td><strong>std::regex</strong></td>";
#endif #endif
@ -373,7 +373,7 @@ void output_html_results(bool show_description, const std::string& tagname)
} }
} }
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true) if(time_std == true)
{ {
print_result(os, first->std_time, first->factor); print_result(os, first->std_time, first->factor);
@ -456,7 +456,7 @@ std::string get_averages_table()
os << "<td><strong>Dynamic Xpressive</strong></td>"; os << "<td><strong>Dynamic Xpressive</strong></td>";
} }
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true) if(time_std == true)
{ {
os << "<td><strong>std::regex</strong></td>"; os << "<td><strong>std::regex</strong></td>";
@ -492,7 +492,7 @@ std::string get_averages_table()
if(time_xpressive == true) if(time_xpressive == true)
os << "<td>" << (xpressive_total / xpressive_test_count) << "</td>\n"; os << "<td>" << (xpressive_total / xpressive_test_count) << "</td>\n";
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true) if(time_std == true)
os << "<td>" << (std_total / std_test_count) << "</td>\n"; os << "<td>" << (std_total / std_test_count) << "</td>\n";
#endif #endif

4
performance/main.cpp
View File

@ -74,7 +74,7 @@ void test_match(const std::string& re, const std::string& text, const std::strin
std::cout << "\txpressive regex: " << time << "s\n"; std::cout << "\txpressive regex: " << time << "s\n";
} }
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true) if(time_std == true)
{ {
time = stdr::time_match(re, text, icase); time = stdr::time_match(re, text, icase);
@ -143,7 +143,7 @@ void test_find_all(const std::string& re, const std::string& text, const std::st
std::cout << "\txpressive regex: " << time << "s\n"; std::cout << "\txpressive regex: " << time << "s\n";
} }
#endif #endif
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true) if(time_std == true)
{ {
time = stdr::time_find_all(re, text, icase); time = stdr::time_find_all(re, text, icase);

2
performance/time_std.cpp
View File

@ -10,7 +10,7 @@
*/ */
#include "regex_comparison.hpp" #include "regex_comparison.hpp"
#ifndef BOOST_NO_0X_HDR_REGEX #ifndef BOOST_NO_CXX11_HDR_REGEX
#include <iostream> #include <iostream>
#include <boost/timer.hpp> #include <boost/timer.hpp>
#include <regex> #include <regex>