Merge fixes from Trunk - mainly warning suppression.

[SVN r65720]
2010-10-02 11:34:33 +00:00
parent 09c9e93572
commit cfedb49110
132 changed files with 4159 additions and 3739 deletions
--- a/test/collate_info/collate_info.cpp
+++ b/test/collate_info/collate_info.cpp
@ -14,6 +14,10 @@
 #include <boost/regex/v4/primary_transform.hpp>
 #include <assert.h>

+#ifdef BOOST_INTEL
+#pragma warning(disable:1418 981 983 2259)
+#endif
+
 #ifdef BOOST_NO_STDC_NAMESPACE
 namespace std{
   using ::strxfrm;