[Boost-commit] svn:boost r40517 - in trunk/boost/ptr_container: . detail

From: nesotto_at_[hidden]
Date: 2007-10-27 18:35:20

Author: nesotto
Date: 2007-10-27 18:35:20 EDT (Sat, 27 Oct 2007)
New Revision: 40517
URL: http://svn.boost.org/trac/boost/changeset/40517

Log:
update that hopefully will help eg the sun compiler
Text files modified: 
   trunk/boost/ptr_container/detail/associative_ptr_container.hpp |     2 +-                                      
   trunk/boost/ptr_container/ptr_map_adapter.hpp                  |     4 ++--                                    
   trunk/boost/ptr_container/ptr_sequence_adapter.hpp             |     4 ++--                                    
   trunk/boost/ptr_container/ptr_set_adapter.hpp                  |     6 +++---                                  
   4 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/ptr_container/detail/associative_ptr_container.hpp
==============================================================================
--- trunk/boost/ptr_container/detail/associative_ptr_container.hpp	(original)
+++ trunk/boost/ptr_container/detail/associative_ptr_container.hpp	2007-10-27 18:35:20 EDT (Sat, 27 Oct 2007)
@@ -150,7 +150,7 @@
             return res;                                          // nothrow
         }
 
-#ifdef BOOST_NO_SFINAE
+#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 #else    
         template< class Range >
         BOOST_DEDUCED_TYPENAME boost::disable_if< boost::is_convertible<Range&,key_type&>, 

Modified: trunk/boost/ptr_container/ptr_map_adapter.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_map_adapter.hpp	(original)
+++ trunk/boost/ptr_container/ptr_map_adapter.hpp	2007-10-27 18:35:20 EDT (Sat, 27 Oct 2007)
@@ -464,7 +464,7 @@
             return this->single_transfer( first, last, from );
         }
 
-#ifdef BOOST_NO_SFINAE 
+#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 #else    
 
         template< class PtrMapAdapter, class Range >
@@ -646,7 +646,7 @@
             return this->multi_transfer( first, last, from );
         }
 
-#ifdef BOOST_NO_SFINAE 
+#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 #else    
 
         template<  class PtrMapAdapter, class Range >

Modified: trunk/boost/ptr_container/ptr_sequence_adapter.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_sequence_adapter.hpp	(original)
+++ trunk/boost/ptr_container/ptr_sequence_adapter.hpp	2007-10-27 18:35:20 EDT (Sat, 27 Oct 2007)
@@ -53,7 +53,7 @@
                         BOOST_DEDUCED_TYPENAME VoidPtrSeq::const_iterator, const U >
                     const_iterator;
 
-#ifdef BOOST_NO_SFINAE
+#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 
         template< class Iter >
         static U* get_pointer( Iter i )
@@ -394,7 +394,7 @@
             from.base().erase( object.base() );                  // nothrow 
         }
 
-#ifdef BOOST_NO_SFINAE
+#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 #else
         
         template< class PtrSeqAdapter, class Range >

Modified: trunk/boost/ptr_container/ptr_set_adapter.hpp
==============================================================================
--- trunk/boost/ptr_container/ptr_set_adapter.hpp	(original)
+++ trunk/boost/ptr_container/ptr_set_adapter.hpp	2007-10-27 18:35:20 EDT (Sat, 27 Oct 2007)
@@ -376,7 +376,7 @@
             return this->single_transfer( first, last, from );
         }
 
-#ifdef BOOST_NO_SFINAE 
+#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 #else    
 
         template< class PtrSetAdapter, class Range >
@@ -510,7 +510,7 @@
             set_basic_clone_and_insert( first, last );
         }
 
-#ifdef BOOST_NO_SFINAE
+#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 #else    
         
         template< class Range >
@@ -538,7 +538,7 @@
             return this->multi_transfer( first, last, from );
         }
 
-#ifdef BOOST_NO_SFINAE
+#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 #else    
         
         template< class PtrSetAdapter, class Range >