aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaveh R. Ghazi <ghazi@caip.rutgers.edu>2002-07-09 00:32:22 +0000
committerKaveh Ghazi <ghazi@gcc.gnu.org>2002-07-09 00:32:22 +0000
commit843265925865d9f5c1c353cabc33a4b29e40137e (patch)
treece43ba988ecb158f09833c2e09a75c033dc07aa5
parentf3970bbacf41d66ad36ef46546cc7a9b8a244398 (diff)
downloadgcc-843265925865d9f5c1c353cabc33a4b29e40137e.zip
gcc-843265925865d9f5c1c353cabc33a4b29e40137e.tar.gz
gcc-843265925865d9f5c1c353cabc33a4b29e40137e.tar.bz2
cp-demangle.c (demangle_v3_with_details): Wrap in !defined IN_GLIBCPP_V3.
* cp-demangle.c (demangle_v3_with_details): Wrap in !defined IN_GLIBCPP_V3. From-SVN: r55335
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/cp-demangle.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index cba9742..4a3ee88 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -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.
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 162aafc..e3ef42c 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -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,