Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r68142 - in trunk: boost boost/flyweight boost/smart_ptr/detail libs/bind/test
From: admin_at_[hidden]
Date: 2011-01-13 21:59:35


Author: wash
Date: 2011-01-13 21:59:34 EST (Thu, 13 Jan 2011)
New Revision: 68142
URL: http://svn.boost.org/trac/boost/changeset/68142

Log:
Pathscale-4.0 configuration code/workarounds.

Text files modified:
   trunk/boost/array.hpp | 2 +-
   trunk/boost/flyweight/refcounted.hpp | 1 +
   trunk/boost/smart_ptr/detail/sp_has_sync.hpp | 4 ++++
   trunk/libs/bind/test/bind_cv_test.cpp | 6 ++++++
   trunk/libs/bind/test/bind_stateful_test.cpp | 5 +++++
   5 files changed, 17 insertions(+), 1 deletions(-)

Modified: trunk/boost/array.hpp
==============================================================================
--- trunk/boost/array.hpp (original)
+++ trunk/boost/array.hpp 2011-01-13 21:59:34 EST (Thu, 13 Jan 2011)
@@ -322,7 +322,7 @@
         static reference failed_rangecheck () {
                 std::out_of_range e("attempt to access element of an empty array");
                 boost::throw_exception(e);
-#if defined(BOOST_NO_EXCEPTIONS) || !defined(BOOST_MSVC)
+#if defined(BOOST_NO_EXCEPTIONS) || (!defined(BOOST_MSVC) && !defined(__PATHSCALE__))
                 //
                 // We need to return something here to keep
                 // some compilers happy: however we will never

Modified: trunk/boost/flyweight/refcounted.hpp
==============================================================================
--- trunk/boost/flyweight/refcounted.hpp (original)
+++ trunk/boost/flyweight/refcounted.hpp 2011-01-13 21:59:34 EST (Thu, 13 Jan 2011)
@@ -14,6 +14,7 @@
 #endif
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
+#include <functional>
 #include <algorithm>
 #include <boost/detail/atomic_count.hpp>
 #include <boost/detail/workaround.hpp>

Modified: trunk/boost/smart_ptr/detail/sp_has_sync.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/sp_has_sync.hpp (original)
+++ trunk/boost/smart_ptr/detail/sp_has_sync.hpp 2011-01-13 21:59:34 EST (Thu, 13 Jan 2011)
@@ -44,6 +44,10 @@
 #undef BOOST_SP_HAS_SYNC
 #endif
 
+#if defined (__PATHSCALE__)
+#undef BOOST_SP_HAS_SYNC
+#endif
+
 #endif // __GNUC__ * 100 + __GNUC_MINOR__ >= 401
 
 #endif // #ifndef BOOST_SMART_PTR_DETAIL_SP_HAS_SYNC_HPP_INCLUDED

Modified: trunk/libs/bind/test/bind_cv_test.cpp
==============================================================================
--- trunk/libs/bind/test/bind_cv_test.cpp (original)
+++ trunk/libs/bind/test/bind_cv_test.cpp 2011-01-13 21:59:34 EST (Thu, 13 Jan 2011)
@@ -33,6 +33,12 @@
 
 struct X
 {
+ // SGI-related compilers have odd compiler-synthesized ctors dtors
+ #ifdef __PATHSCALE__
+ X() {}
+ ~X() {}
+ #endif
+
     int operator()()
     {
         return 17041;

Modified: trunk/libs/bind/test/bind_stateful_test.cpp
==============================================================================
--- trunk/libs/bind/test/bind_stateful_test.cpp (original)
+++ trunk/libs/bind/test/bind_stateful_test.cpp 2011-01-13 21:59:34 EST (Thu, 13 Jan 2011)
@@ -43,6 +43,11 @@
     {
     }
 
+ // SGI-related compilers have odd compiler-synthesized ctors and dtors
+ #ifdef __PATHSCALE__
+ ~X() {}
+ #endif
+
     int state() const
     {
         return state_;


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