Remove use of deprecated macros

This commit is contained in:
Marshall Clow
2015-09-11 15:16:24 -07:00
parent 11dbb1cb5a
commit 6241dc62aa

View File

@ -26,7 +26,7 @@
#include <cstring> #include <cstring>
#if !defined(BOOST_NO_CHAR16_T) || !defined(BOOST_NO_CHAR32_T) #if !defined(BOOST_NO_CXX11_CHAR16_T) || !defined(BOOST_NO_CXX11_CHAR32_T)
#include <string> // for std::char_traits #include <string> // for std::char_traits
#endif #endif
@ -43,14 +43,14 @@ namespace boost
return strlen( s ); return strlen( s );
} }
#ifndef BOOST_NO_CHAR16_T #ifndef BOOST_NO_CXX11_CHAR16_T
inline std::size_t length( const char16_t* s ) inline std::size_t length( const char16_t* s )
{ {
return std::char_traits<char16_t>::length( s ); return std::char_traits<char16_t>::length( s );
} }
#endif #endif
#ifndef BOOST_NO_CHAR32_T #ifndef BOOST_NO_CXX11_CHAR32_T
inline std::size_t length( const char32_t* s ) inline std::size_t length( const char32_t* s )
{ {
return std::char_traits<char32_t>::length( s ); return std::char_traits<char32_t>::length( s );
@ -80,7 +80,7 @@ namespace boost
return true; return true;
} }
#ifndef BOOST_NO_CHAR16_T #ifndef BOOST_NO_CXX11_CHAR16_T
inline bool is_char_ptr( char16_t* ) inline bool is_char_ptr( char16_t* )
{ {
return true; return true;
@ -92,7 +92,7 @@ namespace boost
} }
#endif #endif
#ifndef BOOST_NO_CHAR32_T #ifndef BOOST_NO_CXX11_CHAR32_T
inline bool is_char_ptr( char32_t* ) inline bool is_char_ptr( char32_t* )
{ {
return true; return true;