Merging changes from trunk.

[SVN r58421]
2009-12-16 22:26:57 +00:00
parent 9fab32d84c
commit 72c90873d0
29 changed files with 746 additions and 683 deletions
--- a/include/boost/exception/detail/error_info_impl.hpp
+++ b/include/boost/exception/detail/error_info_impl.hpp
@ -5,6 +5,12 @@

 #ifndef UUID_CE6983AC753411DDA764247956D89593
 #define UUID_CE6983AC753411DDA764247956D89593
+#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma GCC system_header
+#endif
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(push,1)
+#endif

 #include <string>

@ -24,7 +30,6 @@ boost

            protected:

-            virtual
            ~error_info_base() throw()
                {
                }
@ -64,4 +69,7 @@ boost
        };
    }

+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(pop)
+#endif
 #endif