Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r79418 - trunk/libs/regex/performance
From: marshall_at_[hidden]
Date: 2012-07-11 12:21:56


Author: marshall
Date: 2012-07-11 12:21:55 EDT (Wed, 11 Jul 2012)
New Revision: 79418
URL: http://svn.boost.org/trac/boost/changeset/79418

Log:
Switch from deprecated macros to new shiny ones; no functionality change
Text files modified:
   trunk/libs/regex/performance/command_line.cpp | 14 +++++++-------
   trunk/libs/regex/performance/main.cpp | 4 ++--
   trunk/libs/regex/performance/time_std.cpp | 2 +-
   3 files changed, 10 insertions(+), 10 deletions(-)

Modified: trunk/libs/regex/performance/command_line.cpp
==============================================================================
--- trunk/libs/regex/performance/command_line.cpp (original)
+++ trunk/libs/regex/performance/command_line.cpp 2012-07-11 12:21:55 EDT (Wed, 11 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: trunk/libs/regex/performance/main.cpp
==============================================================================
--- trunk/libs/regex/performance/main.cpp (original)
+++ trunk/libs/regex/performance/main.cpp 2012-07-11 12:21:55 EDT (Wed, 11 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: trunk/libs/regex/performance/time_std.cpp
==============================================================================
--- trunk/libs/regex/performance/time_std.cpp (original)
+++ trunk/libs/regex/performance/time_std.cpp 2012-07-11 12:21:55 EDT (Wed, 11 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>


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk