merge from gcc

This commit is contained in:
DJ Delorie 2002-07-09 01:01:18 +00:00
parent 6030b50afa
commit 2a9dffbf14
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2002-07-08 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* cp-demangle.c (demangle_v3_with_details): Wrap in
!defined IN_GLIBCPP_V3.
2002-07-01 Mark Mitchell <mark@codesourcery.com>
* cp-demangle.c (demangle_operator_name): Add type_arg parameter.

View file

@ -3880,6 +3880,7 @@ java_demangle_v3 (mangled)
#endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */
#ifndef IN_GLIBCPP_V3
/* Demangle NAME in the G++ V3 ABI demangling style, and return either
zero, indicating that some error occurred, or a demangling_t
holding the results. */
@ -3917,7 +3918,6 @@ demangle_v3_with_details (name)
}
#ifndef IN_GLIBCPP_V3
/* Return non-zero iff NAME is the mangled form of a constructor name
in the G++ V3 ABI demangling style. Specifically, return:
- '1' if NAME is a complete object constructor,