summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Sonnenberger <joerg@bec.de>2011-05-20 21:59:23 +0200
committerJoerg Sonnenberger <joerg@bec.de>2011-05-20 21:59:23 +0200
commit0026ef5be90b5e8f9879957de3fb4f8383c16598 (patch)
treec3c498ede6102f46506bfab51c00ac24bf94b3ea
parent798f9da2ca3ff11f91a7084a1f15cad033d4d16d (diff)
downloadlibcxxrt-0026ef5be90b5e8f9879957de3fb4f8383c16598.tar.gz
libcxxrt-0026ef5be90b5e8f9879957de3fb4f8383c16598.tar.bz2
libcxxrt-0026ef5be90b5e8f9879957de3fb4f8383c16598.tar.xz
Rename cpp_demangle_gnu3 to __cxa_demangle_gnu3 to fit into the
implementation namespace of the library.
-rw-r--r--src/libelftc_dem_gnu3.c2
-rw-r--r--src/typeinfo.cc4
2 files changed, 3 insertions, 3 deletions
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);