diff options
| author | Carlo Wood <carlo@alinoe.com> | 2003-03-11 13:48:16 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-03-11 13:48:16 +0000 |
| commit | 1be4def3c6aa88e74c2a74a445405191706e323e (patch) | |
| tree | 28dc113399b7733b071c9fcf4738ae34f926ae38 | |
| parent | bff6a7c25d12e7ab0ec20c719b151023aea3106e (diff) | |
| download | gcc-1be4def3c6aa88e74c2a74a445405191706e323e.zip gcc-1be4def3c6aa88e74c2a74a445405191706e323e.tar.gz gcc-1be4def3c6aa88e74c2a74a445405191706e323e.tar.bz2 | |
demangle.h: Prepend accessors of class qualifier with 'get_' in order to fix warnings when...
2003-03-11 Carlo Wood <carlo@alinoe.com>
* include/bits/demangle.h: Prepend accessors of
class qualifier with 'get_' in order to fix warnings
when compiling with -Wshadow.
From-SVN: r64172
| -rw-r--r-- | libstdc++-v3/ChangeLog | 17 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/demangle.h | 12 |
2 files changed, 18 insertions, 11 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f66c6e4..69543e1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-03-11 Carlo Wood <carlo@alinoe.com> + + * include/bits/demangle.h: Prepend accessors of + class qualifier with 'get_' in order to fix warnings + when compiling with -Wshadow. + 2003-03-11 Loren J. Rittle <ljrittle@acm.org> * config/os/bsd/freebsd/ctype_inline.h: Support _M_table @@ -25,8 +31,8 @@ _M_really_overflow, seekoff): Use the boolean parameter in the calls. * include/std/std_fstream.h (sync): Likewise. * src/fstream.cc (basic_filebuf<>::_M_underflow_common): Likewise. - * src/ios.cc (ios_base::Init::_S_ios_create(bool)): Revert libstdc++/8399 - commit involving isatty(0). + * src/ios.cc (ios_base::Init::_S_ios_create(bool)): Revert + libstdc++/8399 commit involving isatty(0). * acinclude.m4 (GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1): Remove. (GLIBCPP_CHECK_UNISTD_SUPPORT): Remove * configure.in: Remove call. @@ -59,9 +65,10 @@ 2003-03-08 Loren J. Rittle <ljrittle@acm.org> * testsuite/26_numerics/c99_classification_macros_c.cc: Tweak test. - - * config/locale/generic/c_locale.cc (locale::facet::_S_create_c_locale): - Throw runtime exception when unsupported language is specified. + + * config/locale/generic/c_locale.cc + (locale::facet::_S_create_c_locale): Throw runtime exception when + unsupported language is specified. * testsuite/testsuite_hooks.h (run_test_wrapped_generic_locale_exception_catcher): New function. * testsuite/testsuite_hooks.cc (run_tests_wrapped_locale): diff --git a/libstdc++-v3/include/bits/demangle.h b/libstdc++-v3/include/bits/demangle.h index 3d0803b..41347a2 100644 --- a/libstdc++-v3/include/bits/demangle.h +++ b/libstdc++-v3/include/bits/demangle.h @@ -172,7 +172,7 @@ namespace __gnu_cxx { } int - start_pos(void) const + get_start_pos(void) const { return M_start_pos; } char @@ -187,7 +187,7 @@ namespace __gnu_cxx } string_type const& - optional_type(void) const + get_optional_type(void) const { return M_optional_type; } bool @@ -1382,7 +1382,7 @@ namespace __gnu_cxx { int saved_inside_substitution = M_demangler.M_inside_substitution; M_demangler.M_inside_substitution = 0; - M_demangler.add_substitution((*iter).start_pos(), type); + M_demangler.add_substitution((*iter).get_start_pos(), type); M_demangler.M_inside_substitution = saved_inside_substitution; } char qualifier_char = (*iter).first_qualifier(); @@ -1407,7 +1407,7 @@ namespace __gnu_cxx continue; case 'A': { - string_type index = (*iter).optional_type(); + string_type index = (*iter).get_optional_type(); if (++iter != M_qualifier_starts.rend() && (*iter).first_qualifier() != 'A') { @@ -1420,12 +1420,12 @@ namespace __gnu_cxx } case 'M': prefix += " "; - prefix += (*iter).optional_type(); + prefix += (*iter).get_optional_type(); prefix += "::*"; break; case 'U': prefix += " "; - prefix += (*iter).optional_type(); + prefix += (*iter).get_optional_type(); break; case 'G': // Only here so we added a substitution. break; |