summaryrefslogtreecommitdiffstats
path: root/lldb/source/Plugins/Disassembler
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Plugins/Disassembler')
-rw-r--r--lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp2
-rw-r--r--lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h18
2 files changed, 10 insertions, 10 deletions
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<DisassemblerLLVMC> 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<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;
};
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<LLVMCDisassembler> m_disasm_ap;
+ std::unique_ptr<LLVMCDisassembler> m_alternate_disasm_ap;
};
#endif // liblldb_DisassemblerLLVM_h_
OpenPOWER on IntegriCloud