From 7b0992d9cd982f4e43ca1bd2c3eaf467e7600cab Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Thu, 18 Apr 2013 22:45:39 +0000 Subject: After discussing with Chris Lattner, we require C++11, so lets get rid of the macros and just use C++11. llvm-svn: 179805 --- .../Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp | 2 +- .../Plugins/Disassembler/llvm/DisassemblerLLVMC.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'lldb/source/Plugins/Disassembler/llvm') diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index b9f7936c4e0..8f0a7e08aa6 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -567,7 +567,7 @@ DisassemblerLLVMC::CreateInstance (const ArchSpec &arch, const char *flavor) { if (arch.GetTriple().getArch() != llvm::Triple::UnknownArch) { - STD_UNIQUE_PTR(DisassemblerLLVMC) disasm_ap (new DisassemblerLLVMC(arch, flavor)); + std::unique_ptr disasm_ap (new DisassemblerLLVMC(arch, flavor)); if (disasm_ap.get() && disasm_ap->IsValid()) return disasm_ap.release(); diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h index 4b9cee2a608..4a265c573d8 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h @@ -55,13 +55,13 @@ class DisassemblerLLVMC : public lldb_private::Disassembler private: bool m_is_valid; - STD_UNIQUE_PTR(llvm::MCContext) m_context_ap; - STD_UNIQUE_PTR(llvm::MCAsmInfo) m_asm_info_ap; - STD_UNIQUE_PTR(llvm::MCSubtargetInfo) m_subtarget_info_ap; - STD_UNIQUE_PTR(llvm::MCInstrInfo) m_instr_info_ap; - STD_UNIQUE_PTR(llvm::MCRegisterInfo) m_reg_info_ap; - STD_UNIQUE_PTR(llvm::MCInstPrinter) m_instr_printer_ap; - STD_UNIQUE_PTR(llvm::MCDisassembler) m_disasm_ap; + std::unique_ptr m_context_ap; + std::unique_ptr m_asm_info_ap; + std::unique_ptr m_subtarget_info_ap; + std::unique_ptr m_instr_info_ap; + std::unique_ptr m_reg_info_ap; + std::unique_ptr m_instr_printer_ap; + std::unique_ptr m_disasm_ap; }; public: @@ -164,8 +164,8 @@ protected: lldb_private::Mutex m_mutex; bool m_data_from_file; - STD_UNIQUE_PTR(LLVMCDisassembler) m_disasm_ap; - STD_UNIQUE_PTR(LLVMCDisassembler) m_alternate_disasm_ap; + std::unique_ptr m_disasm_ap; + std::unique_ptr m_alternate_disasm_ap; }; #endif // liblldb_DisassemblerLLVM_h_ -- cgit v1.2.3