Merge branch 'develop'

Add missing #include <typeinfo> per Trac ticket 11094.
2015-03-11 00:28:20 +02:00 · 2015-03-11 00:27:15 +02:00 · 2015-03-09 00:32:47 +02:00 · 2015-03-09 00:32:02 +02:00 · 2015-03-08 23:37:18 +02:00 · 2015-03-03 11:37:28 -08:00
3 changed files with 4 additions and 3 deletions
--- a/include/boost/core/addressof.hpp
+++ b/include/boost/core/addressof.hpp
@@ -107,7 +107,7 @@ template<class T>
 BOOST_FORCEINLINE
 T * addressof( T & v )
 {
-#if (defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) ) ) || defined( __SUNPRO_CC )
+#if (defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) ) ) || (defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5120))

    return boost::detail::addressof_impl<T>::f( v, 0 );

--- a/include/boost/core/lightweight_test.hpp
+++ b/include/boost/core/lightweight_test.hpp
@@ -123,9 +123,9 @@ template<class T, class U> inline void test_ne_impl( char const * expr1, char co

 inline int report_errors()
 {
-    detail::report_errors_remind().called_report_errors_function = true;
+    boost::detail::report_errors_remind().called_report_errors_function = true;

-    int errors = detail::test_errors();
+    int errors = boost::detail::test_errors();

    if( errors == 0 )
    {
--- a/test/demangle_test.cpp
+++ b/test/demangle_test.cpp
@@ -10,6 +10,7 @@
 //

 #include <boost/core/demangle.hpp>
+#include <typeinfo>
 #include <iostream>

 template<class T1, class T2> struct Y1
Author	SHA1	Message	Date
Peter Dimov	d0ec03e28b	Merge branch 'develop'	2015-03-11 00:28:20 +02:00
Peter Dimov	dd17b055c6	Add missing #include <typeinfo> per Trac ticket 11094.	2015-03-11 00:27:15 +02:00
Peter Dimov	dfa36aeb4c	Merge branch 'develop'	2015-03-09 00:32:47 +02:00
Peter Dimov	67970b9d94	Use BOOST_WORKAROUND.	2015-03-09 00:32:02 +02:00
Peter Dimov	d621fc8e25	Merge pull request #9 from akumta/patch-1 Update addressof.hpp	2015-03-08 23:37:18 +02:00
akumta	85a9400ceb	Update addressof.hpp To update ticket# 10311	2015-03-03 11:37:28 -08:00
Peter Dimov	f6dcd3f891	Merge branch 'develop'	2015-01-19 18:41:50 +02:00
Peter Dimov	37687b800e	Fix ambiguous 'detail' errors under msvc-8.0.	2015-01-18 19:50:40 +02:00
Peter Dimov	148c4840f3	Merge branch 'develop'	2015-01-15 22:01:06 +02:00
Andrey Semashev	2beeb73e70	Fixed a typo in the comment.	2014-08-22 22:49:35 +04:00