OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

locale.cc (__use_cache<numpunct>): Revert previous relocation.

Browse Source 
2003-06-30  Jerry Quinn  <jlquinn@optonline.net>

	* src/locale.cc (__use_cache<numpunct>): Revert previous relocation.
	* include/bits/locale_facets.tcc (__use_cache<numpunct>): Ditto.

From-SVN: r68761
This commit is contained in:
Jerry Quinn 2003-07-01 05:38:04 +00:00 committed by Jerry Quinn
parent 6cf9ac2858
commit e97ee22ea5
3 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2003-06-30 Jerry Quinn <jlquinn@optonline.net>
* src/locale.cc (__use_cache<numpunct>): Revert previous relocation.
* include/bits/locale_facets.tcc (__use_cache<numpunct>): Ditto.
2003-06-30 Benjamin Kosnik <bkoz@redhat.com> 2003-06-30 Benjamin Kosnik <bkoz@redhat.com>
* 27_io/basic_filebuf/seekoff/char/1-in.cc: New. * 27_io/basic_filebuf/seekoff/char/1-in.cc: New.

30
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -93,35 +93,13 @@ namespace std
__use_cache(const locale& __loc); __use_cache(const locale& __loc);
template<> template<>
inline const __numpunct_cache<char>& const __numpunct_cache<char>&
__use_cache(const locale& __loc) __use_cache(const locale& __loc);
{
size_t __i = numpunct<char>::id._M_id();
const locale::facet** __caches = __loc._M_impl->_M_caches;
if (!__caches[__i])
{
__numpunct_cache<char>* __tmp = new __numpunct_cache<char>;
__tmp->_M_cache(__loc);
__loc._M_impl->_M_install_cache(__tmp, __i);
}
return static_cast<const __numpunct_cache<char>&>(*__caches[__i]);
}
#ifdef _GLIBCPP_USE_WCHAR_T #ifdef _GLIBCPP_USE_WCHAR_T
template<> template<>
inline const __numpunct_cache<wchar_t>& const __numpunct_cache<wchar_t>&
__use_cache(const locale& __loc) __use_cache(const locale& __loc);
{
size_t __i = numpunct<wchar_t>::id._M_id();
const locale::facet** __caches = __loc._M_impl->_M_caches;
if (!__caches[__i])
{
__numpunct_cache<wchar_t>* __tmp = new __numpunct_cache<wchar_t>;
__tmp->_M_cache(__loc);
__loc._M_impl->_M_install_cache(__tmp, __i);
}
return static_cast<const __numpunct_cache<wchar_t>&>(*__caches[__i]);
}
#endif #endif
// Stage 1: Determine a conversion specifier. // Stage 1: Determine a conversion specifier.

32
libstdc++-v3/src/locale.cc
View File

@ -449,6 +449,38 @@ namespace std
locale::facet:: locale::facet::
~facet() { } ~facet() { }
template<>
const __numpunct_cache<char>&
__use_cache(const locale& __loc)
{
size_t __i = numpunct<char>::id._M_id();
const locale::facet** __caches = __loc._M_impl->_M_caches;
if (!__caches[__i])
{
__numpunct_cache<char>* __tmp = new __numpunct_cache<char>;
__tmp->_M_cache(__loc);
__loc._M_impl->_M_install_cache(__tmp, __i);
}
return static_cast<const __numpunct_cache<char>&>(*__caches[__i]);
}
#ifdef _GLIBCPP_USE_WCHAR_T
template<>
const __numpunct_cache<wchar_t>&
__use_cache(const locale& __loc)
{
size_t __i = numpunct<wchar_t>::id._M_id();
const locale::facet** __caches = __loc._M_impl->_M_caches;
if (!__caches[__i])
{
__numpunct_cache<wchar_t>* __tmp = new __numpunct_cache<wchar_t>;
__tmp->_M_cache(__loc);
__loc._M_impl->_M_install_cache(__tmp, __i);
}
return static_cast<const __numpunct_cache<wchar_t>&>(*__caches[__i]);
}
#endif
// Definitions for static const data members of time_base // Definitions for static const data members of time_base
template<> template<>
const char* const char*