[llvm-branch-commits] [lldb] r198951 - Fix build issues on Ubuntu 12.04 x86_64 with gcc 4.8.

[Todd Fiala]

Author: tfiala
Date: Fri Jan 10 12:32:59 2014
New Revision: 198951

URL: http://llvm.org/viewvc/llvm-project?rev=198951&view=rev
Log:
Fix build issues on Ubuntu 12.04 x86_64 with gcc 4.8.

Adds an operator= for IOHandler's TreeInfo to resolve gcc 4.8's
refusal to generate a default operator=.

Adds dynamic libedit and libncurses to the liblldb.so linkage on
Linux.

Patch by Steve Pucci, tweaked to adjust for very recent branch
changes.


Modified:
    lldb/branches/iohandler/lib/Makefile
    lldb/branches/iohandler/source/Core/IOHandler.cpp

Modified: lldb/branches/iohandler/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/lib/Makefile?rev=198951&r1=198950&r2=198951&view=diff
==============================================================================
--- lldb/branches/iohandler/lib/Makefile (original)
+++ lldb/branches/iohandler/lib/Makefile Fri Jan 10 12:32:59 2014
@@ -148,7 +148,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
     # Don't allow unresolved symbols.
     LLVMLibsOptions += -Wl,--no-undefined
     # Link in python
-    LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt
+    LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses
     LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
 endif
 

Modified: lldb/branches/iohandler/source/Core/IOHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/source/Core/IOHandler.cpp?rev=198951&r1=198950&r2=198951&view=diff
==============================================================================
--- lldb/branches/iohandler/source/Core/IOHandler.cpp (original)
+++ lldb/branches/iohandler/source/Core/IOHandler.cpp Fri Jan 10 12:32:59 2014
@@ -2262,7 +2262,23 @@ public:
         m_is_expanded (false)
     {
     }
-    
+
+    TreeItem &
+    operator=(const TreeItem &rhs)
+    {
+        if (this != &rhs)
+        {
+            m_parent = rhs.m_parent;
+            m_delegate = rhs.m_delegate;
+            m_identifier = rhs.m_identifier;
+            m_row_idx = rhs.m_row_idx;
+            m_children = rhs.m_children;
+            m_might_have_children = rhs.m_might_have_children;
+            m_is_expanded = rhs.m_is_expanded;
+        }
+        return *this;
+    }
+
     size_t
     GetDepth () const
     {