diff options
author | DJ Delorie <dj@delorie.com> | 2002-09-20 13:45:20 +0000 |
---|---|---|
committer | DJ Delorie <dj@delorie.com> | 2002-09-20 13:45:20 +0000 |
commit | 0a55e5ca18306227fa92b339308819fbbee369b4 (patch) | |
tree | db075fdaae2b49d8920c0ccf72eb18290f649fff /libiberty/cp-demangle.c | |
parent | f9bf43c87f91372b9354da04b2fe8d07f28ba21d (diff) | |
download | gdb-0a55e5ca18306227fa92b339308819fbbee369b4.tar.gz |
merge from gcc
Diffstat (limited to 'libiberty/cp-demangle.c')
-rw-r--r-- | libiberty/cp-demangle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index eece533e070..9adf5fd0503 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -835,8 +835,8 @@ demangling_new (name, style) return NULL; } dm->style = style; - dm->is_constructor = 0; - dm->is_destructor = 0; + dm->is_constructor = (enum gnu_v3_ctor_kinds) 0; + dm->is_destructor = (enum gnu_v3_dtor_kinds) 0; return dm; } @@ -974,7 +974,7 @@ demangle_char (dm, c) else { if (error_message == NULL) - error_message = strdup ("Expected ?"); + error_message = (char *) strdup ("Expected ?"); error_message[9] = c; return error_message; } @@ -3974,7 +3974,7 @@ is_gnu_v3_mangled_ctor (name) return result; } else - return 0; + return (enum gnu_v3_ctor_kinds) 0; } @@ -3996,7 +3996,7 @@ is_gnu_v3_mangled_dtor (name) return result; } else - return 0; + return (enum gnu_v3_dtor_kinds) 0; } #endif /* IN_GLIBCPP_V3 */ |