summaryrefslogtreecommitdiff
path: root/libcxxabi
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-09-21 19:21:37 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-09-21 19:21:37 +0000
commit128ec49e296657b60eeeea2bf2a3eacca5efe358 (patch)
treef6d28978c1eec0aa0c3b5670b0777ebc03970fe1 /libcxxabi
parented3d690f68d2a49a55f2f767a68f5dd66914b64a (diff)
downloadllvm-128ec49e296657b60eeeea2bf2a3eacca5efe358.tar.gz
Rename class __lambda to __lambda_node to avoid clash with gcc. This fixes http://llvm.org/bugs/show_bug.cgi?id=13889
llvm-svn: 164405
Diffstat (limited to 'libcxxabi')
-rw-r--r--libcxxabi/src/cxa_demangle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp
index f16ee4f8fb00..32f63ebc8a67 100644
--- a/libcxxabi/src/cxa_demangle.cpp
+++ b/libcxxabi/src/cxa_demangle.cpp
@@ -3932,11 +3932,11 @@ public:
}
};
-class __lambda
+class __lambda_node
: public __node
{
public:
- __lambda(__node* params, const char *number, size_t number_size)
+ __lambda_node(__node* params, const char *number, size_t number_size)
{
__right_ = params;
__name_ = number;
@@ -7009,7 +7009,7 @@ __demangle_tree::__parse_unnamed_type_name(const char* first, const char* last)
return first;
if (type == 'l')
- __make<__lambda>(__root_, number_start, static_cast<size_t>(number_end - number_start));
+ __make<__lambda_node>(__root_, number_start, static_cast<size_t>(number_end - number_start));
else
__make<__unnamed>(number_start, static_cast<size_t>(number_end - number_start));