Subject: [Boost-commit] svn:boost r78510 - trunk/boost/config/compiler
From: mimomorin_at_[hidden]
Date: 2012-05-19 08:20:32
Author: michel
Date: 2012-05-19 08:20:31 EDT (Sat, 19 May 2012)
New Revision: 78510
URL: http://svn.boost.org/trac/boost/changeset/78510
Log:
Fix clang's config:
* `typeid` is useless when `-fno-rtti` is turned on.
* Protect `BOOST_NO_RTTI` and `BOOST_NO_TYPEID` from redefinition, as done for `BOOST_NO_EXCEPTIONS`.
Text files modified:
trunk/boost/config/compiler/clang.hpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
Modified: trunk/boost/config/compiler/clang.hpp
==============================================================================
--- trunk/boost/config/compiler/clang.hpp (original)
+++ trunk/boost/config/compiler/clang.hpp 2012-05-19 08:20:31 EDT (Sat, 19 May 2012)
@@ -12,10 +12,14 @@
# define BOOST_NO_EXCEPTIONS
#endif
-#if !__has_feature(cxx_rtti)
+#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_RTTI)
# define BOOST_NO_RTTI
#endif
+#if !__has_feature(cxx_rtti) && !defined(BOOST_NO_TYPEID)
+# define BOOST_NO_TYPEID
+#endif
+
#if defined(__int64)
# define BOOST_HAS_MS_INT64
#endif