Commit 1be4def3 by Carlo Wood Committed by Benjamin Kosnik

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
parent bff6a7c2
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> 2003-03-11 Loren J. Rittle <ljrittle@acm.org>
* config/os/bsd/freebsd/ctype_inline.h: Support _M_table * config/os/bsd/freebsd/ctype_inline.h: Support _M_table
...@@ -25,8 +31,8 @@ ...@@ -25,8 +31,8 @@
_M_really_overflow, seekoff): Use the boolean parameter in the calls. _M_really_overflow, seekoff): Use the boolean parameter in the calls.
* include/std/std_fstream.h (sync): Likewise. * include/std/std_fstream.h (sync): Likewise.
* src/fstream.cc (basic_filebuf<>::_M_underflow_common): Likewise. * src/fstream.cc (basic_filebuf<>::_M_underflow_common): Likewise.
* src/ios.cc (ios_base::Init::_S_ios_create(bool)): Revert libstdc++/8399 * src/ios.cc (ios_base::Init::_S_ios_create(bool)): Revert
commit involving isatty(0). libstdc++/8399 commit involving isatty(0).
* acinclude.m4 (GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1): Remove. * acinclude.m4 (GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1): Remove.
(GLIBCPP_CHECK_UNISTD_SUPPORT): Remove (GLIBCPP_CHECK_UNISTD_SUPPORT): Remove
* configure.in: Remove call. * configure.in: Remove call.
...@@ -59,9 +65,10 @@ ...@@ -59,9 +65,10 @@
2003-03-08 Loren J. Rittle <ljrittle@acm.org> 2003-03-08 Loren J. Rittle <ljrittle@acm.org>
* testsuite/26_numerics/c99_classification_macros_c.cc: Tweak test. * testsuite/26_numerics/c99_classification_macros_c.cc: Tweak test.
* config/locale/generic/c_locale.cc (locale::facet::_S_create_c_locale): * config/locale/generic/c_locale.cc
Throw runtime exception when unsupported language is specified. (locale::facet::_S_create_c_locale): Throw runtime exception when
unsupported language is specified.
* testsuite/testsuite_hooks.h * testsuite/testsuite_hooks.h
(run_test_wrapped_generic_locale_exception_catcher): New function. (run_test_wrapped_generic_locale_exception_catcher): New function.
* testsuite/testsuite_hooks.cc (run_tests_wrapped_locale): * testsuite/testsuite_hooks.cc (run_tests_wrapped_locale):
......
...@@ -172,7 +172,7 @@ namespace __gnu_cxx ...@@ -172,7 +172,7 @@ namespace __gnu_cxx
{ } { }
int int
start_pos(void) const get_start_pos(void) const
{ return M_start_pos; } { return M_start_pos; }
char char
...@@ -187,7 +187,7 @@ namespace __gnu_cxx ...@@ -187,7 +187,7 @@ namespace __gnu_cxx
} }
string_type const& string_type const&
optional_type(void) const get_optional_type(void) const
{ return M_optional_type; } { return M_optional_type; }
bool bool
...@@ -1382,7 +1382,7 @@ namespace __gnu_cxx ...@@ -1382,7 +1382,7 @@ namespace __gnu_cxx
{ {
int saved_inside_substitution = M_demangler.M_inside_substitution; int saved_inside_substitution = M_demangler.M_inside_substitution;
M_demangler.M_inside_substitution = 0; 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; M_demangler.M_inside_substitution = saved_inside_substitution;
} }
char qualifier_char = (*iter).first_qualifier(); char qualifier_char = (*iter).first_qualifier();
...@@ -1407,7 +1407,7 @@ namespace __gnu_cxx ...@@ -1407,7 +1407,7 @@ namespace __gnu_cxx
continue; continue;
case 'A': case 'A':
{ {
string_type index = (*iter).optional_type(); string_type index = (*iter).get_optional_type();
if (++iter != M_qualifier_starts.rend() if (++iter != M_qualifier_starts.rend()
&& (*iter).first_qualifier() != 'A') && (*iter).first_qualifier() != 'A')
{ {
...@@ -1420,12 +1420,12 @@ namespace __gnu_cxx ...@@ -1420,12 +1420,12 @@ namespace __gnu_cxx
} }
case 'M': case 'M':
prefix += " "; prefix += " ";
prefix += (*iter).optional_type(); prefix += (*iter).get_optional_type();
prefix += "::*"; prefix += "::*";
break; break;
case 'U': case 'U':
prefix += " "; prefix += " ";
prefix += (*iter).optional_type(); prefix += (*iter).get_optional_type();
break; break;
case 'G': // Only here so we added a substitution. case 'G': // Only here so we added a substitution.
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment