diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2003-11-21 05:49:21 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-11-21 05:49:21 +0000 |
| commit | 9dc420e68d3a0e03032c903e4f39894255c72a44 (patch) | |
| tree | 8c4a70e26a85634dc0f2becc0d2aacb9f7c0ae1f | |
| parent | c862d589d28d39dc1fe947acbc5830748b980985 (diff) | |
| download | gcc-9dc420e68d3a0e03032c903e4f39894255c72a44.zip gcc-9dc420e68d3a0e03032c903e4f39894255c72a44.tar.gz gcc-9dc420e68d3a0e03032c903e4f39894255c72a44.tar.bz2 | |
formatter.h: Use _Tp as template argument.
2003-11-20 Benjamin Kosnik <bkoz@redhat.com>
* include/debug/formatter.h: Use _Tp as template argument.
* src/debug.cc: Same, instantiate std::size_t.
From-SVN: r73792
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/formatter.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/debug.cc | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7263ff847..5e600e6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2003-11-20 Benjamin Kosnik <bkoz@redhat.com> + * include/debug/formatter.h: Use _Tp as template argument. + * src/debug.cc: Same, instantiate std::size_t. + +2003-11-20 Benjamin Kosnik <bkoz@redhat.com> + PR libstdc++/13109 * include/debug/formatter.h (_Error_formatter::_M_format_word): New. * src/debug.cc (__gnu_debug): Format. diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h index a6b3c77..1a627a9 100644 --- a/libstdc++-v3/include/debug/formatter.h +++ b/libstdc++-v3/include/debug/formatter.h @@ -356,9 +356,9 @@ namespace __gnu_debug _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) { } - template<typename _T> + template<typename _Tp> void - _M_format_word(char*, int, const char*, _T) const; + _M_format_word(char*, int, const char*, _Tp) const; void _M_print_word(const char* __word) const; diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc index a00a250..a78bdec 100644 --- a/libstdc++-v3/src/debug.cc +++ b/libstdc++-v3/src/debug.cc @@ -496,11 +496,11 @@ namespace __gnu_debug abort(); } - template<typename _T> + template<typename _Tp> void _Error_formatter::_M_format_word(char* __buf, int __n __attribute__((__unused__)), - const char* __fmt, _T __s) const + const char* __fmt, _Tp __s) const { #ifdef _GLIBCXX_USE_C99 std::snprintf(__buf, __n, __fmt, __s); @@ -651,7 +651,7 @@ namespace __gnu_debug template void _Error_formatter::_M_format_word(char* __buf, int __n, const char* __fmt, - unsigned int __s) const; + std::size_t __s) const; template void |