[Lldb-commits] [lldb] r169515 - /lldb/trunk/source/Core/cxa_demangle.cpp

[Daniel Malea]

Author: dmalea
Date: Thu Dec  6 10:52:09 2012
New Revision: 169515

URL: http://llvm.org/viewvc/llvm-project?rev=169515&view=rev
Log:
Merge rename fix from libcxxabi (r169402: rename class with name that clashes with GCC 4.6/4.7) 


Modified:
    lldb/trunk/source/Core/cxa_demangle.cpp

Modified: lldb/trunk/source/Core/cxa_demangle.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/cxa_demangle.cpp?rev=169515&r1=169514&r2=169515&view=diff
==============================================================================
--- lldb/trunk/source/Core/cxa_demangle.cpp (original)
+++ lldb/trunk/source/Core/cxa_demangle.cpp Thu Dec  6 10:52:09 2012
@@ -3941,11 +3941,11 @@
     }
 };
 
-class __lambda_node
+class ___lambda_node
     : public __node
 {
 public:
-    __lambda_node(__node* params, const char *number, size_t number_size)
+    ___lambda_node(__node* params, const char *number, size_t number_size)
     {
         __right_ = params;
         __name_ = number;
@@ -7024,7 +7024,7 @@
             t = number_end + 1;
             if (type == 'l')
             {
-                if (!__make<__lambda_node>(params, number_start, static_cast<size_t>(number_end - number_start)))
+                if (!__make<___lambda_node>(params, number_start, static_cast<size_t>(number_end - number_start)))
                     return first;
             }
             else