diff --git a/lib/pal/typename.hpp b/lib/pal/typename.hpp index ce7f691de..22399998e 100644 --- a/lib/pal/typename.hpp +++ b/lib/pal/typename.hpp @@ -12,16 +12,16 @@ #include #include -__inline static std::string demangle(const char* name) { +__inline static std::string mat_demangle(const char* name) { int status = -4; std::unique_ptr res{ abi::__cxa_demangle(name, NULL, NULL, &status), std::free }; return (status == 0) ? res.get() : name; } -#define TYPENAME(t) demangle(typeid(t).name()).c_str() +#define TYPENAME(t) mat_demangle(typeid(t).name()).c_str() #define HAS_RTTI 1 #else -#define demangle(name) (name) +#define mat_demangle(name) (name) #if defined(_CPPRTTI) && defined(_WIN32) #define TYPENAME(t) typeid(t).name() diff --git a/lib/utils/Utils.cpp b/lib/utils/Utils.cpp index d1639088a..e2360ca18 100644 --- a/lib/utils/Utils.cpp +++ b/lib/utils/Utils.cpp @@ -58,7 +58,7 @@ namespace MAT_NS_BEGIN { strings = backtrace_symbols(array, size); printf("XXXXXXXXXXXXXXXXXXXX Obtained %zd stack frames:\n", size); for (i = 0; i < size; i++) - printf("[%2lu] %s\n", i, demangle(strings[i]).c_str()); + printf("[%2lu] %s\n", i, mat_demangle(strings[i]).c_str()); printf("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"); free(strings); #endif