diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/codecvt_specializations.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 33c2d80a806..addb120314c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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. diff --git a/libstdc++-v3/include/ext/codecvt_specializations.h b/libstdc++-v3/include/ext/codecvt_specializations.h index 137c4a7fccd..f0a6bbed4d6 100644 --- a/libstdc++-v3/include/ext/codecvt_specializations.h +++ b/libstdc++-v3/include/ext/codecvt_specializations.h @@ -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 |