merged changes in regex5 branch

[SVN r26692]

performance/time_greta.cpp

@@ -48,7 +48,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          e.match(text, what);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
@@ -94,7 +94,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }