Merge patches from Trunk.

[SVN r78692]
This commit is contained in:
John Maddock
2012-05-27 17:48:27 +00:00
parent 9d2a5f4d44
commit 816c3e22ec
2 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -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