diff options
| author | emaste <emaste@FreeBSD.org> | 2013-12-03 18:51:59 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2013-12-03 18:51:59 +0000 |
| commit | 0f31a1ef7ecf609d469ee5b34b3f0cb24ae3492d (patch) | |
| tree | b2051e4e4856cc58ac7e2d20242b870b4f355ca1 /source/Core/Mangled.cpp | |
| parent | c727fe695d28799acb499e9961f11ec07d4f9fe2 (diff) | |
| download | FreeBSD-src-0f31a1ef7ecf609d469ee5b34b3f0cb24ae3492d.zip FreeBSD-src-0f31a1ef7ecf609d469ee5b34b3f0cb24ae3492d.tar.gz | |
Import lldb as of SVN r196259 (git 3be86e5)
(A number of files not required for the FreeBSD build have been removed.)
Sponsored by: DARPA, AFRL
Diffstat (limited to 'source/Core/Mangled.cpp')
| -rw-r--r-- | source/Core/Mangled.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/Core/Mangled.cpp b/source/Core/Mangled.cpp index 189c3bc..a41986d 100644 --- a/source/Core/Mangled.cpp +++ b/source/Core/Mangled.cpp @@ -10,7 +10,9 @@ // FreeBSD9-STABLE requires this to know about size_t in cxxabi.h #include <cstddef> -#if defined(_MSC_VER) || defined (__FreeBSD__) +#if defined(_MSC_VER) +// Cannot enable the builtin demangler on msvc as it does not support the cpp11 within the implementation. +#elif defined (__FreeBSD__) #define LLDB_USE_BUILTIN_DEMANGLER #else #include <cxxabi.h> @@ -4890,6 +4892,9 @@ Mangled::GetDemangledName () const // add it to our map. #ifdef LLDB_USE_BUILTIN_DEMANGLER char *demangled_name = __cxa_demangle (mangled_cstr, NULL, NULL, NULL); +#elif defined(_MSC_VER) + // Cannot demangle on msvc. + char *demangled_name = nullptr; #else char *demangled_name = abi::__cxa_demangle (mangled_cstr, NULL, NULL, NULL); #endif |
