diff --git a/performance/command_line.cpp b/performance/command_line.cpp index 7c7a5a68..bdebc7a1 100644 --- a/performance/command_line.cpp +++ b/performance/command_line.cpp @@ -34,6 +34,7 @@ bool time_safe_greta = false; bool time_posix = false; bool time_pcre = false; bool time_xpressive = false; +bool time_std = false; bool test_matches = false; bool test_code = false; @@ -55,6 +56,7 @@ double locale_boost_total = 0; double posix_total = 0; double pcre_total = 0; double xpressive_total = 0; +double std_total = 0; unsigned greta_test_count = 0; unsigned safe_greta_test_count = 0; unsigned boost_test_count = 0; @@ -62,6 +64,7 @@ unsigned locale_boost_test_count = 0; unsigned posix_test_count = 0; unsigned pcre_test_count = 0; unsigned xpressive_test_count = 0; +unsigned std_test_count = 0; int handle_argument(const std::string& what) { @@ -86,6 +89,10 @@ int handle_argument(const std::string& what) #ifdef BOOST_HAS_XPRESSIVE else if(what == "-xpressive" || what == "-dxpr") time_xpressive = true; +#endif +#ifndef BOOST_NO_0X_HDR_REGEX + else if(what == "-std") + time_std = true; #endif else if(what == "-all") { @@ -103,6 +110,9 @@ int handle_argument(const std::string& what) #endif #ifdef BOOST_HAS_XPRESSIVE time_xpressive = true; +#endif +#ifndef BOOST_NO_0X_HDR_REGEX + time_std = true; #endif } else if(what == "-test-matches") @@ -166,6 +176,9 @@ int show_usage() #endif #ifdef BOOST_HAS_XPRESSIVE " -dxpr Apply tests to dynamic xpressive library\n" +#endif +#ifndef BOOST_NO_0X_HDR_REGEX + " -std Apply tests to std::regex.\n" #endif " -all Apply tests to all libraries\n\n" " test options:\n" @@ -273,6 +286,10 @@ void output_html_results(bool show_description, const std::string& tagname) #ifdef BOOST_HAS_XPRESSIVE if(time_xpressive == true) os << "
For each of the following regular expressions the time taken to find all occurrences of the expression within a medium sized English language text was - measured (the first 50K from mtent12.txt).
+ measured (the first 50K from mtent12.txt - up to the end of Chapter 1).%short_twain_search%
For each of the following regular expressions the time taken to find all @@ -73,3 +73,4 @@