Subject: [Boost-commit] svn:boost r79532 - branches/release/libs/regex/performance
From: marshall_at_[hidden]
Date: 2012-07-15 10:42:25
Author: marshall
Date: 2012-07-15 10:42:24 EDT (Sun, 15 Jul 2012)
New Revision: 79532
URL: http://svn.boost.org/trac/boost/changeset/79532
Log:
Merge macro changes for Boost.Regex; no functionality change
Properties modified:
branches/release/libs/regex/performance/command_line.cpp (contents, props changed)
branches/release/libs/regex/performance/main.cpp (contents, props changed)
branches/release/libs/regex/performance/time_std.cpp (contents, props changed)
Text files modified:
branches/release/libs/regex/performance/command_line.cpp | 14 +++++++-------
branches/release/libs/regex/performance/main.cpp | 4 ++--
branches/release/libs/regex/performance/time_std.cpp | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
Modified: branches/release/libs/regex/performance/command_line.cpp
==============================================================================
--- branches/release/libs/regex/performance/command_line.cpp (original)
+++ branches/release/libs/regex/performance/command_line.cpp 2012-07-15 10:42:24 EDT (Sun, 15 Jul 2012)
@@ -90,7 +90,7 @@
else if(what == "-xpressive" || what == "-dxpr")
time_xpressive = true;
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
else if(what == "-std")
time_std = true;
#endif
@@ -111,7 +111,7 @@
#ifdef BOOST_HAS_XPRESSIVE
time_xpressive = true;
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
time_std = true;
#endif
}
@@ -177,7 +177,7 @@
#ifdef BOOST_HAS_XPRESSIVE
" -dxpr Apply tests to dynamic xpressive library\n"
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
" -std Apply tests to std::regex.\n"
#endif
" -all Apply tests to all libraries\n\n"
@@ -287,7 +287,7 @@
if(time_xpressive == true)
os << "<td><strong>Dynamic Xpressive</strong></td>";
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true)
os << "<td><strong>std::regex</strong></td>";
#endif
@@ -373,7 +373,7 @@
}
}
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true)
{
print_result(os, first->std_time, first->factor);
@@ -456,7 +456,7 @@
os << "<td><strong>Dynamic Xpressive</strong></td>";
}
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true)
{
os << "<td><strong>std::regex</strong></td>";
@@ -492,7 +492,7 @@
if(time_xpressive == true)
os << "<td>" << (xpressive_total / xpressive_test_count) << "</td>\n";
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true)
os << "<td>" << (std_total / std_test_count) << "</td>\n";
#endif
Modified: branches/release/libs/regex/performance/main.cpp
==============================================================================
--- branches/release/libs/regex/performance/main.cpp (original)
+++ branches/release/libs/regex/performance/main.cpp 2012-07-15 10:42:24 EDT (Sun, 15 Jul 2012)
@@ -74,7 +74,7 @@
std::cout << "\txpressive regex: " << time << "s\n";
}
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true)
{
time = stdr::time_match(re, text, icase);
@@ -143,7 +143,7 @@
std::cout << "\txpressive regex: " << time << "s\n";
}
#endif
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
if(time_std == true)
{
time = stdr::time_find_all(re, text, icase);
Modified: branches/release/libs/regex/performance/time_std.cpp
==============================================================================
--- branches/release/libs/regex/performance/time_std.cpp (original)
+++ branches/release/libs/regex/performance/time_std.cpp 2012-07-15 10:42:24 EDT (Sun, 15 Jul 2012)
@@ -10,7 +10,7 @@
*/
#include "regex_comparison.hpp"
-#ifndef BOOST_NO_0X_HDR_REGEX
+#ifndef BOOST_NO_CXX11_HDR_REGEX
#include <iostream>
#include <boost/timer.hpp>
#include <regex>