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/example/grep/grep.cpp
+++ b/example/grep/grep.cpp
@ -13,9 +13,14 @@
 #include <fstream>
 #include <string>
 #include <vector>
-#include <boost/program_options.hpp>
 #include <boost/regex.hpp>

+#ifdef BOOST_MSVC
+#pragma warning(disable:4512 4244)
+#endif
+
+#include <boost/program_options.hpp>
+
 namespace po = boost::program_options;

 int after_context;