mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-02 05:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

rc_string_base.h (_M_compare<wchar_t>): Protect with _GLIBCXX_USE_WCHAR_T.

Browse Source 
2006-10-02  Paolo Carlini  <pcarlini@suse.de>

	* include/ext/rc_string_base.h (_M_compare<wchar_t>):
	Protect with _GLIBCXX_USE_WCHAR_T.
	* include/ext/sso_string_base.h (_M_compare<wchar_t>):
	Likewise.
	(__sso_string_base<>::_M_destroy): Inline.

From-SVN: r117373
This commit is contained in:
Paolo Carlini 2006-10-02 16:09:19 +00:00 committed by Paolo Carlini
parent 1f1a03efff
commit 1c846af9c5
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2006-10-02 Paolo Carlini <pcarlini@suse.de>
* include/ext/rc_string_base.h (_M_compare<wchar_t>):
Protect with _GLIBCXX_USE_WCHAR_T.
* include/ext/sso_string_base.h (_M_compare<wchar_t>):
Likewise.
(__sso_string_base<>::_M_destroy): Inline.
2006-10-02 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/pb_ds/detail/basic_types.hpp (comp_hash_): Remove,

2
libstdc++-v3/include/ext/rc_string_base.h
View File

@ -699,6 +699,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
return false;
}
#ifdef _GLIBCXX_USE_WCHAR_T
template<>
inline bool
__rc_string_base<wchar_t, std::char_traits<wchar_t>,
@ -709,6 +710,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
return true;
return false;
}
#endif
_GLIBCXX_END_NAMESPACE

11
libstdc++-v3/include/ext/sso_string_base.h
View File

@ -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<typename _CharT, typename _Traits, typename _Alloc>
void
__sso_string_base<_CharT, _Traits, _Alloc>::
_M_destroy(size_type __size) throw()
{ _M_get_allocator().deallocate(_M_data(), __size + 1); }
template<typename _CharT, typename _Traits, typename _Alloc>
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<wchar_t, std::char_traits<wchar_t>,
@ -564,6 +560,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
return true;
return false;
}
#endif
_GLIBCXX_END_NAMESPACE