|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r61434 - in trunk/boost/config: . stdlib
From: john_at_[hidden]
Date: 2010-04-20 13:48:17
Author: johnmaddock
Date: 2010-04-20 13:48:16 EDT (Tue, 20 Apr 2010)
New Revision: 61434
URL: http://svn.boost.org/trac/boost/changeset/61434
Log:
Fixes #4115: sometimes VC++ doesn't put typeinfo in namespace std.
Text files modified:
trunk/boost/config/stdlib/dinkumware.hpp | 5 +++++
trunk/boost/config/suffix.hpp | 6 ++++++
2 files changed, 11 insertions(+), 0 deletions(-)
Modified: trunk/boost/config/stdlib/dinkumware.hpp
==============================================================================
--- trunk/boost/config/stdlib/dinkumware.hpp (original)
+++ trunk/boost/config/stdlib/dinkumware.hpp 2010-04-20 13:48:16 EDT (Tue, 20 Apr 2010)
@@ -86,6 +86,11 @@
# define BOOST_NO_STD_LOCALE
#endif
+#include <typeinfo>
+#if !_HAS_EXCEPTIONS
+# define BOOST_NO_STD_TYPEINFO
+#endif
+
// C++0x headers implemented in 520 (as shipped by Microsoft)
//
#if !defined(_CPPLIB_VER) || _CPPLIB_VER < 520
Modified: trunk/boost/config/suffix.hpp
==============================================================================
--- trunk/boost/config/suffix.hpp (original)
+++ trunk/boost/config/suffix.hpp 2010-04-20 13:48:16 EDT (Tue, 20 Apr 2010)
@@ -554,6 +554,12 @@
#endif // defined BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
+// When BOOST_NO_STD_TYPEINFO is defined, we can just import
+// the global definition into std namespace:
+#ifdef BOOST_NO_STD_TYPEINFO
+#include <typeinfo>
+namespace std{ using ::typeinfo; }
+#endif
// ---------------------------------------------------------------------------//
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk