From 4ab0ffee0a420e3fde248807a4276233c44614fe Mon Sep 17 00:00:00 2001
From: Marshall Clow <marshall@idio.com>
Date: Wed, 11 Jul 2012 16:21:55 +0000
Subject: [PATCH] Switch from deprecated macros to new shiny ones; no
 functionality change

[SVN r79418]
---
 performance/command_line.cpp | 14 +++++++-------
 performance/main.cpp         |  4 ++--
 performance/time_std.cpp     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/performance/command_line.cpp b/performance/command_line.cpp
index bdebc7a1..2d2ac7ba 100644
--- a/performance/command_line.cpp
+++ b/performance/command_line.cpp
@@ -90,7 +90,7 @@ int handle_argument(const std::string& what)
    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 @@ int handle_argument(const std::string& what)
 #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 @@ int show_usage()
 #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 @@ void output_html_results(bool show_description, const std::string& tagname)
       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 @@ void output_html_results(bool show_description, const std::string& tagname)
             }
          }
 #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 @@ std::string get_averages_table()
       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 @@ std::string get_averages_table()
    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
diff --git a/performance/main.cpp b/performance/main.cpp
index 3301fb59..b7ba8a52 100644
--- a/performance/main.cpp
+++ b/performance/main.cpp
@@ -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";
    }
 #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 @@ void test_find_all(const std::string& re, const std::string& text, const std::st
       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);
diff --git a/performance/time_std.cpp b/performance/time_std.cpp
index 46fa212b..9284add1 100644
--- a/performance/time_std.cpp
+++ b/performance/time_std.cpp
@@ -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>