Skip to content

Rename demangle to mat_demangle to avoid boost name conflict #1479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmehta001 wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

Rename demangle to mat_demangle to avoid boost name conflict #1479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/pal/typename.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
#include <memory>
#include <cxxabi.h>

__inline static std::string demangle(const char* name) {
__inline static std::string mat_demangle(const char* name) {
int status = -4;
std::unique_ptr<char, void(*)(void*)> 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()
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading