fixed nasty metrowerks bug and disabled range overloads for sun compiler

[SVN r33663]
This commit is contained in:
Thorsten Jørgen Ottosen
2006-04-11 18:58:50 +00:00
parent 6236471040
commit d2ea264db8
4 changed files with 12 additions and 13 deletions

View File

@@ -82,7 +82,11 @@ namespace ptr_container_detail
class reversible_ptr_container
{
private:
#ifdef __MWERKS__
enum { allow_null = Config::allow_null };
#else
BOOST_STATIC_CONSTANT( bool, allow_null = Config::allow_null );
#endif
typedef BOOST_DEDUCED_TYPENAME Config::value_type Ty_;

View File

@@ -452,7 +452,7 @@ namespace ptr_container_detail
return this->single_transfer( first, last, from );
}
#ifdef BOOST_NO_SFINAE
#if defined(BOOST_NO_SFINAE) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
#else
template< class PtrMapAdapter, class Range >
@@ -627,7 +627,7 @@ namespace ptr_container_detail
return this->multi_transfer( first, last, from );
}
#ifdef BOOST_NO_SFINAE
#if defined(BOOST_NO_SFINAE) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
#else
template< class PtrMapAdapter, class Range >

View File

@@ -312,11 +312,6 @@ namespace ptr_container_detail
template< class InputIterator >
void assign( InputIterator first, InputIterator last ) // strong
{
//#ifdef BOOST_NO_SFINAE
//#else
// BOOST_STATIC_ASSERT(( boost::is_convertible< typename iterator_reference<InputIterator>::type,
// reference_type >::value ));
//#endif
base_type temp( first, last );
this->swap( temp );
}
@@ -355,7 +350,7 @@ namespace ptr_container_detail
iterator_category<InputIterator>::type() );
}
#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
#if defined(BOOST_NO_SFINAE) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
#else
template< class Range >
BOOST_DEDUCED_TYPENAME
@@ -397,7 +392,7 @@ namespace ptr_container_detail
from.c_private().erase( object.base() ); // nothrow
}
#ifdef BOOST_NO_SFINAE
#if defined(BOOST_NO_SFINAE) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
#else
template< class PtrSeqAdapter, class Range >

View File

@@ -308,7 +308,7 @@ namespace ptr_container_detail
set_basic_clone_and_insert( first, last );
}
#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
#if defined(BOOST_NO_SFINAE) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
#else
template< class Range >
@@ -337,7 +337,7 @@ namespace ptr_container_detail
return this->single_transfer( first, last, from );
}
#ifdef BOOST_NO_SFINAE
#if defined(BOOST_NO_SFINAE) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
#else
template< class PtrSetAdapter, class Range >
@@ -458,7 +458,7 @@ namespace ptr_container_detail
set_basic_clone_and_insert( first, last );
}
#ifdef BOOST_NO_SFINAE
#if defined(BOOST_NO_SFINAE) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
#else
template< class Range >
@@ -486,7 +486,7 @@ namespace ptr_container_detail
return this->multi_transfer( first, last, from );
}
#ifdef BOOST_NO_SFINAE
#if defined(BOOST_NO_SFINAE) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
#else
template< class PtrSetAdapter, class Range >