Header patch, virtual dtor patch and missed UUID patch from Kirk Beitz.

llvm-svn: 124931

23 files changed, 20 insertions, 43 deletions

diff --git a/lldb/include/lldb/API/SBInputReader.h b/lldb/include/lldb/API/SBInputReader.h
index 6c2ea25c984..9c1659dc240 100644
--- a/lldb/include/lldb/API/SBInputReader.h
+++ b/lldb/include/lldb/API/SBInputReader.h
@@ -12,8 +12,6 @@
 
 #include "lldb/API/SBDefines.h"
 
-#include <termios.h>
-
 namespace lldb {
 
 class SBInputReader
diff --git a/lldb/include/lldb/Core/EmulateInstruction.h b/lldb/include/lldb/Core/EmulateInstruction.h
index edaae509dee..1958cade3da 100644
--- a/lldb/include/lldb/Core/EmulateInstruction.h
+++ b/lldb/include/lldb/Core/EmulateInstruction.h
@@ -168,7 +168,7 @@ public:
         eOpcode16,
         eOpcode32,
         eOpcode64,
-        eOpcodeBytes,
+        eOpcodeBytes
     };
 
     struct Instruction
diff --git a/lldb/include/lldb/Core/InputReader.h b/lldb/include/lldb/Core/InputReader.h
index a37a9a68950..af9c3723d68 100644
--- a/lldb/include/lldb/Core/InputReader.h
+++ b/lldb/include/lldb/Core/InputReader.h
@@ -10,8 +10,6 @@
 #ifndef liblldb_InputReader_h_
 #define liblldb_InputReader_h_
 
-#include <termios.h>
-
 #include "lldb/lldb-include.h"
 #include "lldb/lldb-enumerations.h"
 #include "lldb/Core/Debugger.h"
diff --git a/lldb/include/lldb/Expression/ASTStructExtractor.h b/lldb/include/lldb/Expression/ASTStructExtractor.h
index b4af65f1e68..ade512c9912 100644
--- a/lldb/include/lldb/Expression/ASTStructExtractor.h
+++ b/lldb/include/lldb/Expression/ASTStructExtractor.h
@@ -59,7 +59,7 @@ public:
     //----------------------------------------------------------------------
     /// Destructor
     //----------------------------------------------------------------------
-    ~ASTStructExtractor();
+    virtual ~ASTStructExtractor();
     
     //----------------------------------------------------------------------
     /// Link this consumer with a particular AST context
diff --git a/lldb/include/lldb/Expression/IRDynamicChecks.h b/lldb/include/lldb/Expression/IRDynamicChecks.h
index 909505b4310..ab72cb1c6f7 100644
--- a/lldb/include/lldb/Expression/IRDynamicChecks.h
+++ b/lldb/include/lldb/Expression/IRDynamicChecks.h
@@ -111,7 +111,7 @@ public:
     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~IRDynamicChecks();
+    virtual ~IRDynamicChecks();
     
     //------------------------------------------------------------------
     /// Run this IR transformer on a single module
diff --git a/lldb/include/lldb/Expression/IRForTarget.h b/lldb/include/lldb/Expression/IRForTarget.h
index feb4eb11779..4c45c6405f4 100644
--- a/lldb/include/lldb/Expression/IRForTarget.h
+++ b/lldb/include/lldb/Expression/IRForTarget.h
@@ -82,7 +82,7 @@ public:
     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~IRForTarget();
+    virtual ~IRForTarget();
     
     //------------------------------------------------------------------
     /// Run this IR transformer on a single module
diff --git a/lldb/include/lldb/Expression/IRToDWARF.h b/lldb/include/lldb/Expression/IRToDWARF.h
index 54fdb8463ea..b7c929bc9db 100644
--- a/lldb/include/lldb/Expression/IRToDWARF.h
+++ b/lldb/include/lldb/Expression/IRToDWARF.h
@@ -62,7 +62,7 @@ public:
     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~IRToDWARF();
+    virtual ~IRToDWARF();
     
     //------------------------------------------------------------------
     /// Run this IR transformer on a single module
diff --git a/lldb/include/lldb/Host/Endian.h b/lldb/include/lldb/Host/Endian.h
index bc36f68f20a..610f3ce95c4 100644
--- a/lldb/include/lldb/Host/Endian.h
+++ b/lldb/include/lldb/Host/Endian.h
@@ -10,7 +10,7 @@
 #ifndef liblldb_host_endian_h_
 #define liblldb_host_endian_h_
 
-#include <lldb-enumerations.h>
+#include "lldb/lldb-enumerations.h"
 
 namespace lldb {
 
diff --git a/lldb/include/lldb/Host/Symbols.h b/lldb/include/lldb/Host/Symbols.h
index 7359dda8a6d..a0a0f23fc3e 100644
--- a/lldb/include/lldb/Host/Symbols.h
+++ b/lldb/include/lldb/Host/Symbols.h
@@ -25,10 +25,10 @@ class Symbols
 {
 public:
     static FileSpec
-    LocateExecutableObjectFile (const FileSpec *in_exec, const ArchSpec* arch, const UUID *uuid);
+    LocateExecutableObjectFile (const FileSpec *in_exec, const ArchSpec* arch, const lldb_private::UUID *uuid);
 
     static FileSpec
-    LocateExecutableSymbolFile (const FileSpec *in_exec, const ArchSpec* arch, const UUID *uuid);
+    LocateExecutableSymbolFile (const FileSpec *in_exec, const ArchSpec* arch, const lldb_private::UUID *uuid);
 };
 
 } // namespace lldb_private
diff --git a/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h b/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
index 0828936099f..c4dd9d154b7 100644
--- a/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
+++ b/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
@@ -17,6 +17,8 @@
 #include <Python.h>
 #endif
 
+#include <termios.h>
+
 #include "lldb/lldb-private.h"
 #include "lldb/Interpreter/ScriptInterpreter.h"
 #include "lldb/Core/InputReader.h"
diff --git a/lldb/include/lldb/Target/ThreadPlanTracer.h b/lldb/include/lldb/Target/ThreadPlanTracer.h
index 1471e7f0637..3dba7aa8d6f 100644
--- a/lldb/include/lldb/Target/ThreadPlanTracer.h
+++ b/lldb/include/lldb/Target/ThreadPlanTracer.h
@@ -31,7 +31,7 @@ public:
         eLocation = 0,
         eStateChange,
         eCheckFrames,
-        ePython,
+        ePython
     } ThreadPlanTracerStyle;
     ThreadPlanTracer (Thread &thread, lldb::StreamSP &stream_sp);    
     ThreadPlanTracer (Thread &thread);
diff --git a/lldb/include/lldb/Utility/PseudoTerminal.h b/lldb/include/lldb/Utility/PseudoTerminal.h
index ff50e68ab59..c36c864f442 100644
--- a/lldb/include/lldb/Utility/PseudoTerminal.h
+++ b/lldb/include/lldb/Utility/PseudoTerminal.h
@@ -13,7 +13,6 @@
 
 
 #include <fcntl.h>
-#include <termios.h>
 #include <string>
 
 #include "lldb/lldb-defines.h"
diff --git a/lldb/include/lldb/lldb-forward-rtti.h b/lldb/include/lldb/lldb-forward-rtti.h
index 8b6a2522307..29aea763cae 100644
--- a/lldb/include/lldb/lldb-forward-rtti.h
+++ b/lldb/include/lldb/lldb-forward-rtti.h
@@ -13,7 +13,6 @@
 #if defined(__cplusplus)
 
 #include "lldb/lldb-types.h"
-#include "lldb/lldb-forward.h"
 
 //----------------------------------------------------------------------
 // lldb forward declarations
diff --git a/lldb/include/lldb/lldb-include.h b/lldb/include/lldb/lldb-include.h
index 7384b557568..e259c0bc150 100644
--- a/lldb/include/lldb/lldb-include.h
+++ b/lldb/include/lldb/lldb-include.h
@@ -11,9 +11,6 @@
 #define LLDB_include_h_
 
 #include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h"
-#include "lldb/lldb-forward.h"
 #include "lldb/lldb-forward-rtti.h"
-#include "lldb/lldb-types.h"
 
 #endif  // LLDB_include_h_
diff --git a/lldb/source/Commands/CommandObjectBreakpoint.h b/lldb/source/Commands/CommandObjectBreakpoint.h
index c2d9e3efa9a..6f31a5ffc29 100644
--- a/lldb/source/Commands/CommandObjectBreakpoint.h
+++ b/lldb/source/Commands/CommandObjectBreakpoint.h
@@ -284,7 +284,7 @@ public:
     typedef enum BreakpointClearType
     {
         eClearTypeInvalid,
-        eClearTypeFileAndLine,
+        eClearTypeFileAndLine
     } BreakpointClearType;
 
     CommandObjectBreakpointClear (CommandInterpreter &interpreter);
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index b94489cdf94..305cbe2ef75 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -21,6 +21,7 @@
 #include "lldb/Target/StopInfo.h"
 #include "lldb/Target/Thread.h"
 
+#include <termios.h>
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp
index 0adaa355b1f..0faace6fd1f 100644
--- a/lldb/source/Core/EmulateInstruction.cpp
+++ b/lldb/source/Core/EmulateInstruction.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "EmulateInstruction.h"
+#include "lldb/Core/EmulateInstruction.h"
 
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/PluginManager.h"
diff --git a/lldb/source/Core/Error.cpp b/lldb/source/Core/Error.cpp
index ee7d6f21cda..f12f34ba6b7 100644
--- a/lldb/source/Core/Error.cpp
+++ b/lldb/source/Core/Error.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // C Includes
-#include <sys/errno.h>
+#include <errno.h>
 
 // C++ Includes
 // Other libraries and framework includes
diff --git a/lldb/source/Core/UUID.cpp b/lldb/source/Core/UUID.cpp
index 035a9e57e11..37d1eaa738d 100644
--- a/lldb/source/Core/UUID.cpp
+++ b/lldb/source/Core/UUID.cpp
@@ -186,7 +186,7 @@ lldb_private::operator == (const lldb_private::UUID &lhs, const lldb_private::UU
 bool
 lldb_private::operator != (const lldb_private::UUID &lhs, const lldb_private::UUID &rhs)
 {
-    return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), UUID::GetByteSize()) != 0;
+    return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), lldb_private::UUID::GetByteSize()) != 0;
 }
 
 bool
diff --git a/lldb/source/Host/macosx/Symbols.cpp b/lldb/source/Host/macosx/Symbols.cpp
index e44d2899111..71748490f79 100644
--- a/lldb/source/Host/macosx/Symbols.cpp
+++ b/lldb/source/Host/macosx/Symbols.cpp
@@ -11,7 +11,6 @@
 
 // C Includes
 #include <dirent.h>
-#include <mach/machine.h>
 #include "llvm/Support/MachO.h"
 
 // C++ Includes
diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
index 0ebc095f57b..61bab4851cf 100644
--- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
@@ -8,19 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 // In order to guarantee correct working with Python, Python.h *MUST* be
-// the *FIRST* header file included:
-
-#if defined (__APPLE__)
-#include <Python/Python.h>
-#else
-#include <Python.h>
-#endif
+// the *FIRST* header file included in ScriptInterpreterPython.h, and that
+// must be the *FIRST* header file included here.
 
 #include "lldb/Interpreter/ScriptInterpreterPython.h"
 
-
-#include <sys/ioctl.h>
-#include <termios.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -28,20 +20,12 @@
 
 #include "lldb/API/SBFrame.h"
 #include "lldb/API/SBBreakpointLocation.h"
-#include "lldb/Breakpoint/Breakpoint.h"
-#include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Breakpoint/StoppointCallbackContext.h"
 #include "lldb/Core/Debugger.h"
-#include "lldb/Core/FileSpec.h"
-#include "lldb/Core/InputReader.h"
-#include "lldb/Core/Stream.h"
-#include "lldb/Core/StreamString.h"
 #include "lldb/Core/Timer.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
-#include "lldb/Core/Debugger.h"
-#include "lldb/Target/Process.h"
 #include "lldb/Target/Thread.h"
 
 // This function is in the C++ output file generated by SWIG after it is 
diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
index b6ba71e28c7..7ccce2b0fe9 100644
--- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
+++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
@@ -56,7 +56,7 @@ public:
         eEncodingT2,
         eEncodingT3,
         eEncodingT4,
-        eEncodingT5,
+        eEncodingT5
     } ARMEncoding;
     
 
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
index b46b5c95133..88a17b0dc95 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
@@ -217,7 +217,7 @@ protected:
         flagsGotDebugPubNamesData   = (1 << 7),
         flagsGotDebugPubTypesData   = (1 << 8),
         flagsGotDebugRangesData     = (1 << 9),
-        flagsGotDebugStrData        = (1 << 10),
+        flagsGotDebugStrData        = (1 << 10)
     };
 
     DISALLOW_COPY_AND_ASSIGN (SymbolFileDWARF);