Merged accumulated patches from Trunk.

[SVN r62831]
2010-06-12 08:30:11 +00:00
parent 61f4b3360f
commit 9529cb8bc0
91 changed files with 4251 additions and 4062 deletions
--- a/performance/command_line.cpp
+++ b/performance/command_line.cpp
@ -100,6 +100,9 @@ int handle_argument(const std::string& what)
 #endif
 #ifdef BOOST_HAS_PCRE
      time_pcre = true;
+#endif
+#ifdef BOOST_HAS_XPRESSIVE
+      time_xpressive = true;
 #endif
   }
   else if(what == "-test-matches")