commit 8dd3fdbf43640021964546bb5b3bac52a3b7fcaa
author Eugene Zelenko <eugene.zelenko@gmail.com> Wed Oct 21 01:42:15 2015 +0000
committer Eugene Zelenko <eugene.zelenko@gmail.com> Wed Oct 21 01:42:15 2015 +0000
tree a704a3b98c159caec43161f2c0c49db1bf8b1b30
parent 100424124bf1f2845c8cac18e39333cf5f04b1ae

Revert r250872 in source/Plugins/Disassembler to fix MSVC builds failures.

llvm-svn: 250874

lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h

diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
index e5efc57..4e32951 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
@@ -10,19 +10,10 @@
 #ifndef liblldb_DisassemblerLLVMC_h_
 #define liblldb_DisassemblerLLVMC_h_
 
-// C Includes
-// C++ Includes
 #include <string>
 
-// Other libraries and framework includes
 #include "llvm-c/Disassembler.h"
 
-// Project includes
-#include "lldb/Core/Address.h"
-#include "lldb/Core/Disassembler.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/Host/Mutex.h"
-
 // Opaque references to C++ Objects in LLVM's MC.
 namespace llvm
 {
@@ -34,7 +25,12 @@
     class MCInstPrinter;
     class MCAsmInfo;
     class MCSubtargetInfo;
-} // namespace llvm
+}
+
+#include "lldb/Core/Address.h"
+#include "lldb/Core/Disassembler.h"
+#include "lldb/Core/PluginManager.h"
+#include "lldb/Host/Mutex.h"
 
 class InstructionLLVMC;
 
@@ -47,7 +43,7 @@
     public:
         LLVMCDisassembler (const char *triple, const char *cpu, const char *features_str, unsigned flavor, DisassemblerLLVMC &owner);
 
-        ~LLVMCDisassembler() = default;
+        ~LLVMCDisassembler();
 
         uint64_t GetMCInst (const uint8_t *opcode_data, size_t opcode_data_len, lldb::addr_t pc, llvm::MCInst &mc_inst);
         uint64_t PrintMCInst (llvm::MCInst &mc_inst, char *output_buffer, size_t out_buffer_len);
@@ -71,10 +67,6 @@
     };
 
 public:
-    DisassemblerLLVMC(const lldb_private::ArchSpec &arch, const char *flavor /* = NULL */);
-
-    ~DisassemblerLLVMC() override = default;
-
     //------------------------------------------------------------------
     // Static Functions
     //------------------------------------------------------------------
@@ -90,28 +82,33 @@
     static lldb_private::Disassembler *
     CreateInstance(const lldb_private::ArchSpec &arch, const char *flavor);
 
-    size_t
-    DecodeInstructions(const lldb_private::Address &base_addr,
-                       const lldb_private::DataExtractor& data,
-                       lldb::offset_t data_offset,
-                       size_t num_instructions,
-                       bool append,
-                       bool data_from_file) override;
+    DisassemblerLLVMC(const lldb_private::ArchSpec &arch, const char *flavor /* = NULL */);
+
+    virtual
+    ~DisassemblerLLVMC();
+
+    virtual size_t
+    DecodeInstructions (const lldb_private::Address &base_addr,
+                        const lldb_private::DataExtractor& data,
+                        lldb::offset_t data_offset,
+                        size_t num_instructions,
+                        bool append,
+                        bool data_from_file);
 
     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------
-    lldb_private::ConstString
-    GetPluginName() override;
+    virtual lldb_private::ConstString
+    GetPluginName();
 
-    uint32_t
-    GetPluginVersion() override;
+    virtual uint32_t
+    GetPluginVersion();
 
 protected:
     friend class InstructionLLVMC;
 
-    bool
-    FlavorValidForArchSpec(const lldb_private::ArchSpec &arch, const char *flavor) override;
+    virtual bool
+    FlavorValidForArchSpec (const lldb_private::ArchSpec &arch, const char *flavor);
 
     bool
     IsValid()
@@ -167,4 +164,4 @@
     std::unique_ptr<LLVMCDisassembler> m_alternate_disasm_ap;
 };
 
-#endif // liblldb_DisassemblerLLVM_h_
+#endif  // liblldb_DisassemblerLLVM_h_