Subject: [Boost-commit] svn:boost r78692 - in branches/release/boost/config: . compiler
From: john_at_[hidden]
Date: 2012-05-27 13:48:28
Author: johnmaddock
Date: 2012-05-27 13:48:27 EDT (Sun, 27 May 2012)
New Revision: 78692
URL: http://svn.boost.org/trac/boost/changeset/78692
Log:
Merge patches from Trunk.
Properties modified:
branches/release/boost/config/ (props changed)
Text files modified:
branches/release/boost/config/compiler/clang.hpp | 6 +++++-
branches/release/boost/config/compiler/pgi.hpp | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
Modified: branches/release/boost/config/compiler/clang.hpp
==============================================================================
--- branches/release/boost/config/compiler/clang.hpp (original)
+++ branches/release/boost/config/compiler/clang.hpp 2012-05-27 13:48:27 EDT (Sun, 27 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
Modified: branches/release/boost/config/compiler/pgi.hpp
==============================================================================
--- branches/release/boost/config/compiler/pgi.hpp (original)
+++ branches/release/boost/config/compiler/pgi.hpp 2012-05-27 13:48:27 EDT (Sun, 27 May 2012)
@@ -21,7 +21,7 @@
// options requested by configure --enable-test
#define BOOST_HAS_PTHREADS
#define BOOST_HAS_THREADS
-#undef BOOST_HAS_PTHREAD_YIELD
+#define BOOST_HAS_PTHREAD_YIELD
#define BOOST_HAS_NRVO
#define BOOST_HAS_LONG_LONG