[boost][range] - Ticket 6149 - as_literal causing unnecessary copy (on very silly compilers)

[SVN r77992]
This commit is contained in:
Neil Groves
2012-04-15 12:18:02 +00:00
parent 11238e4c19
commit e6279d4436

View File

@ -25,7 +25,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <cstring> #include <cstring>
#ifndef BOOST_NO_CWCHAR #ifndef BOOST_NO_CWCHAR
#include <cwchar> #include <cwchar>
#endif #endif
@ -38,72 +38,72 @@ namespace boost
return strlen( s ); return strlen( s );
} }
#ifndef BOOST_NO_CWCHAR #ifndef BOOST_NO_CWCHAR
inline std::size_t length( const wchar_t* s ) inline std::size_t length( const wchar_t* s )
{ {
return wcslen( s ); return wcslen( s );
} }
#endif #endif
// //
// Remark: the compiler cannot choose between T* and T[sz] // Remark: the compiler cannot choose between T* and T[sz]
// overloads, so we must put the T* internal to the // overloads, so we must put the T* internal to the
// unconstrained version. // unconstrained version.
// //
inline bool is_char_ptr( char* ) inline bool is_char_ptr( char* )
{ {
return true; return true;
} }
inline bool is_char_ptr( const char* ) inline bool is_char_ptr( const char* )
{ {
return true; return true;
} }
#ifndef BOOST_NO_CWCHAR #ifndef BOOST_NO_CWCHAR
inline bool is_char_ptr( wchar_t* ) inline bool is_char_ptr( wchar_t* )
{ {
return true; return true;
} }
inline bool is_char_ptr( const wchar_t* ) inline bool is_char_ptr( const wchar_t* )
{ {
return true; return true;
} }
#endif #endif
template< class T > template< class T >
inline long is_char_ptr( T /* r */ ) inline long is_char_ptr( const T& /* r */ )
{ {
return 0L; return 0L;
} }
template< class T > template< class T >
inline iterator_range<T*> inline iterator_range<T*>
make_range( T* const r, bool ) make_range( T* const r, bool )
{ {
return iterator_range<T*>( r, r + length(r) ); return iterator_range<T*>( r, r + length(r) );
} }
template< class T > template< class T >
inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<T>::type> inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<T>::type>
make_range( T& r, long ) make_range( T& r, long )
{ {
return boost::make_iterator_range( r ); return boost::make_iterator_range( r );
} }
} }
template< class Range > template< class Range >
inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<Range>::type> inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<Range>::type>
as_literal( Range& r ) as_literal( Range& r )
{ {
return range_detail::make_range( r, range_detail::is_char_ptr(r) ); return range_detail::make_range( r, range_detail::is_char_ptr(r) );
} }
template< class Range > template< class Range >
inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<const Range>::type> inline iterator_range<BOOST_DEDUCED_TYPENAME range_iterator<const Range>::type>
as_literal( const Range& r ) as_literal( const Range& r )
{ {
return range_detail::make_range( r, range_detail::is_char_ptr(r) ); return range_detail::make_range( r, range_detail::is_char_ptr(r) );
@ -112,9 +112,9 @@ namespace boost
template< class Char, std::size_t sz > template< class Char, std::size_t sz >
inline iterator_range<Char*> as_literal( Char (&arr)[sz] ) inline iterator_range<Char*> as_literal( Char (&arr)[sz] )
{ {
return range_detail::make_range( arr, range_detail::is_char_ptr(arr) ); return range_detail::make_range( arr, range_detail::is_char_ptr(arr) );
} }
template< class Char, std::size_t sz > template< class Char, std::size_t sz >
inline iterator_range<const Char*> as_literal( const Char (&arr)[sz] ) inline iterator_range<const Char*> as_literal( const Char (&arr)[sz] )
{ {