Merge fixes from Trunk - mainly warning suppression.

[SVN r65720]

performance/time_std.cpp

@@ -0,0 +1,123 @@
+/*
+ *
+ * Copyright (c) 2002
+ * John Maddock
+ *
+ * Use, modification and distribution are subject to the 
+ * Boost Software License, Version 1.0. (See accompanying file 
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+#include "regex_comparison.hpp"
+#ifndef BOOST_NO_0X_HDR_REGEX
+#include <iostream>
+#include <boost/timer.hpp>
+#include <regex>
+
+namespace stdr{
+
+double time_match(const std::string& re, const std::string& text, bool icase)
+{
+    try{
+    std::regex e(re, (icase ? std::regex::ECMAScript | std::regex::icase : std::regex::ECMAScript));
+    std::smatch what;
+    boost::timer tim;
+    int iter = 1;
+    int counter, repeats;
+    double result = 0;
+    double run;
+    do
+    {
+        tim.restart();
+        for(counter = 0; counter < iter; ++counter)
+        {
+            std::regex_match(text, what, e);
+        }
+        result = tim.elapsed();
+        iter *= 2;
+    }while(result < 0.5);
+    iter /= 2;
+
+    // repeat test and report least value for consistency:
+    for(repeats = 0; repeats < REPEAT_COUNT; ++repeats)
+    {
+        tim.restart();
+        for(counter = 0; counter < iter; ++counter)
+        {
+            std::regex_match(text, what, e);
+        }
+        run = tim.elapsed();
+        result = (std::min)(run, result);
+    }
+    return result / iter;
+    }
+    catch(const std::exception& e)
+    {
+        std::cout << "Exception: " << e.what() << std::endl;
+        return -1;
+    }
+}
+
+bool dummy_grep_proc(const std::smatch&)
+{ return true; }
+
+struct noop
+{
+    void operator()( std::smatch const & ) const
+    {
+    }
+};
+
+double time_find_all(const std::string& re, const std::string& text, bool icase)
+{
+    try{
+    std::regex e(re, (icase ? std::regex::ECMAScript | std::regex::icase : std::regex::ECMAScript));
+    std::smatch what;
+    boost::timer tim;
+    int iter = 1;
+    int counter, repeats;
+    double result = 0;
+    double run;
+    do
+    {
+        tim.restart();
+        for(counter = 0; counter < iter; ++counter)
+        {
+            std::sregex_iterator begin( text.begin(), text.end(), e ), end;
+            std::for_each( begin, end, noop() );
+            //std::regex_grep(&dummy_grep_proc, text, e);
+        }
+        result = tim.elapsed();
+        iter *= 2;
+    }while(result < 0.5);
+    iter /= 2;
+
+    if(result >10)
+        return result / iter;
+
+    // repeat test and report least value for consistency:
+    for(repeats = 0; repeats < REPEAT_COUNT; ++repeats)
+    {
+        tim.restart();
+        for(counter = 0; counter < iter; ++counter)
+        {
+            std::sregex_iterator begin( text.begin(), text.end(), e ), end;
+            std::for_each( begin, end, noop() );
+            //std::regex_grep(&dummy_grep_proc, text, e);
+        }
+        run = tim.elapsed();
+        result = (std::min)(run, result);
+    }
+    return result / iter;
+    }
+    catch(const std::exception& e)
+    {
+        std::cout << "Exception: " << e.what() << std::endl;
+        return -1;
+    }
+}
+
+}
+
+#endif