diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/demangle/abi_examples/01.cc | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/demangle/abi_examples/02.cc | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6d3eea2..afdac30 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2005-02-15 Jakub Jelinek <jakub@redhat.com> + + PR libstdc++/19946 + * testsuite/demangle/abi_examples/01.cc (main): Adjust for 2005-02-13 + demangler change. + * testsuite/demangle/abi_examples/02.cc (main): Likewise. + 2005-02-13 Richard Guenther <rguenth@gcc.gnu.org> Paolo Carlini <pcarlini@suse.de> diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/01.cc b/libstdc++-v3/testsuite/demangle/abi_examples/01.cc index e7c41e7..3e26eb9 100644 --- a/libstdc++-v3/testsuite/demangle/abi_examples/01.cc +++ b/libstdc++-v3/testsuite/demangle/abi_examples/01.cc @@ -1,6 +1,6 @@ // 2003-02-26 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,7 +31,9 @@ int main() // extern "C" function // extern "C" float f(void) { }; // T f - verify_demangle("f", "error code = -2: invalid mangled name"); + // f is ambiguous between "C" external name and internal built-in type + // name. The ambiguity is resolved to the built-in type name. + verify_demangle("f", "float"); return 0; } diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/02.cc b/libstdc++-v3/testsuite/demangle/abi_examples/02.cc index bbae938..094b777 100644 --- a/libstdc++-v3/testsuite/demangle/abi_examples/02.cc +++ b/libstdc++-v3/testsuite/demangle/abi_examples/02.cc @@ -1,6 +1,6 @@ // 2003-02-26 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,7 +31,9 @@ int main() // or variable "f" // int f; // B f - verify_demangle("f", "error code = -2: invalid mangled name"); + // f is ambiguous between variable external name and internal built-in type + // name. The ambiguity is resolved to the built-in type name. + verify_demangle("f", "float"); return 0; } |