Skip to content
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.

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

fix: Misbehaving preprocessor directive in absence of <cxxabi.h> #4830

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Foundation/include/Poco/Types.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ using UIntPtr = std::uintptr_t;
inline std::string Foundation_API demangle(const char* typeName)
{
std::string result(typeName);
#if __has_include(<cxxabi.h>)
#ifdef POCO_HAVE_CXXABI_H
int status;
char* demangled = abi::__cxa_demangle(typeName, nullptr, nullptr, &status);
Expand All @@ -104,6 +105,7 @@ inline std::string Foundation_API demangle(const char* typeName)

std::free(demangled);
}
#endif
#endif
return result;
}
Expand Down
Loading