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

codevt_specializations.h (__iconv_adaptor): Use identifier _Tp instead of _T in template argument to avoid conflict. 

* include/ext/codevt_specializations.h (__iconv_adaptor): Use
	identifier _Tp instead of _T in template argument to avoid conflict.

From-SVN: r115823
This commit is contained in:
Roger Sayle 2006-07-30 16:42:39 +00:00 committed by Roger Sayle
parent 43804767bb
commit bd11bebe1b
2 changed files with 8 additions and 3 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 @@
2006-07-30 Roger Sayle <roger@eyesopen.com>
* include/ext/codevt_specializations.h (__iconv_adaptor): Use
identifier _Tp instead of _T in template argument to avoid conflict.
2006-07-30 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (stable_sort): Uglify the buf variable.

6
libstdc++-v3/include/ext/codecvt_specializations.h
View File

@ -301,12 +301,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// argument to iconv(): SUSv2 and others use 'const char**', but glibc 2.2
// uses 'char**', which matches the POSIX 1003.1-2001 standard.
// Using this adaptor, g++ will do the work for us.
template<typename _T>
template<typename _Tp>
inline size_t
__iconv_adaptor(size_t(*__func)(iconv_t, _T, size_t*, char**, size_t*),
__iconv_adaptor(size_t(*__func)(iconv_t, _Tp, size_t*, char**, size_t*),
iconv_t __cd, char** __inbuf, size_t* __inbytes,
char** __outbuf, size_t* __outbytes)
{ return __func(__cd, (_T)__inbuf, __inbytes, __outbuf, __outbytes); }
{ return __func(__cd, (_Tp)__inbuf, __inbytes, __outbuf, __outbytes); }
template<typename _InternT, typename _ExternT>
codecvt_base::result