From 1c846af9c5feacfaaff015a38422eedebb3fdf95 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 2 Oct 2006 16:09:19 +0000 Subject: [PATCH] rc_string_base.h (_M_compare): Protect with _GLIBCXX_USE_WCHAR_T. 2006-10-02 Paolo Carlini * include/ext/rc_string_base.h (_M_compare): Protect with _GLIBCXX_USE_WCHAR_T. * include/ext/sso_string_base.h (_M_compare): Likewise. (__sso_string_base<>::_M_destroy): Inline. From-SVN: r117373 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/ext/rc_string_base.h | 2 ++ libstdc++-v3/include/ext/sso_string_base.h | 11 ++++------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d756a7ed2da..dac9c9f4db6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2006-10-02 Paolo Carlini + + * include/ext/rc_string_base.h (_M_compare): + Protect with _GLIBCXX_USE_WCHAR_T. + * include/ext/sso_string_base.h (_M_compare): + Likewise. + (__sso_string_base<>::_M_destroy): Inline. + 2006-10-02 Benjamin Kosnik * include/ext/pb_ds/detail/basic_types.hpp (comp_hash_): Remove, diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h index 3d41fe5dde1..081194bf4f4 100644 --- a/libstdc++-v3/include/ext/rc_string_base.h +++ b/libstdc++-v3/include/ext/rc_string_base.h @@ -699,6 +699,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) return false; } +#ifdef _GLIBCXX_USE_WCHAR_T template<> inline bool __rc_string_base, @@ -709,6 +710,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) return true; return false; } +#endif _GLIBCXX_END_NAMESPACE diff --git a/libstdc++-v3/include/ext/sso_string_base.h b/libstdc++-v3/include/ext/sso_string_base.h index 7f7e2b544c6..5a13d401270 100644 --- a/libstdc++-v3/include/ext/sso_string_base.h +++ b/libstdc++-v3/include/ext/sso_string_base.h @@ -92,7 +92,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) } void - _M_destroy(size_type) throw(); + _M_destroy(size_type __size) throw() + { _M_get_allocator().deallocate(_M_data(), __size + 1); } // _M_construct_aux is used to implement the 21.3.1 para 15 which // requires special behaviour if _InIterator is an integral type @@ -221,12 +222,6 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { return false; } }; - template - void - __sso_string_base<_CharT, _Traits, _Alloc>:: - _M_destroy(size_type __size) throw() - { _M_get_allocator().deallocate(_M_data(), __size + 1); } - template void __sso_string_base<_CharT, _Traits, _Alloc>:: @@ -554,6 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) return false; } +#ifdef _GLIBCXX_USE_WCHAR_T template<> inline bool __sso_string_base, @@ -564,6 +560,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) return true; return false; } +#endif _GLIBCXX_END_NAMESPACE -- 2.30.2