[cfe-commits] [libcxxabi] r164405 - /libcxxabi/trunk/src/cxa_demangle.cpp

[Howard Hinnant]

Author: hhinnant
Date: Fri Sep 21 14:21:37 2012
New Revision: 164405

URL: http://llvm.org/viewvc/llvm-project?rev=164405&view=rev
Log:
Rename class __lambda to __lambda_node to avoid clash with gcc.  This fixes http://llvm.org/bugs/show_bug.cgi?id=13889

Modified:
    libcxxabi/trunk/src/cxa_demangle.cpp

Modified: libcxxabi/trunk/src/cxa_demangle.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_demangle.cpp?rev=164405&r1=164404&r2=164405&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_demangle.cpp (original)
+++ libcxxabi/trunk/src/cxa_demangle.cpp Fri Sep 21 14:21:37 2012
@@ -3932,11 +3932,11 @@
     }
 };
 
-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 @@
                 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));