From 0026ef5be90b5e8f9879957de3fb4f8383c16598 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Fri, 20 May 2011 21:59:23 +0200 Subject: Rename cpp_demangle_gnu3 to __cxa_demangle_gnu3 to fit into the implementation namespace of the library. --- src/libelftc_dem_gnu3.c | 2 +- src/typeinfo.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/libelftc_dem_gnu3.c b/src/libelftc_dem_gnu3.c index ddf7853..1982bfc 100644 --- a/src/libelftc_dem_gnu3.c +++ b/src/libelftc_dem_gnu3.c @@ -449,7 +449,7 @@ static int cpp_demangle_gnu3_push_head; * @todo 1. Testing and more test case. 2. Code cleaning. */ char * -cpp_demangle_gnu3(const char *org) +__cxa_demangle_gnu3(const char *org) { struct cpp_demangle_data ddata; ssize_t org_len; diff --git a/src/typeinfo.cc b/src/typeinfo.cc index f5c254d..b0deb8b 100644 --- a/src/typeinfo.cc +++ b/src/typeinfo.cc @@ -44,7 +44,7 @@ ABI_NAMESPACE::__pointer_type_info::~__pointer_type_info() {} ABI_NAMESPACE::__pointer_to_member_type_info::~__pointer_to_member_type_info() {} // From libelftc -extern "C" char *cpp_demangle_gnu3(const char *); +extern "C" char *__cxa_demangle_gnu3(const char *); /** * Demangles a C++ symbol or type name. The buffer, if non-NULL, must be @@ -69,7 +69,7 @@ extern "C" char* __cxa_demangle(const char* mangled_name, // however, and for our changes to be pushed upstream. We also need to // call a different demangling function here depending on the ABI (e.g. // ARM). - char *demangled = cpp_demangle_gnu3(mangled_name); + char *demangled = __cxa_demangle_gnu3(mangled_name); if (NULL != demangled) { size_t len = strlen(demangled); -- cgit v1.2.3