diff options
| -rw-r--r-- | lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp | 7 | ||||
| -rw-r--r-- | lldb/source/Target/StopInfo.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index 61a57ef3fcd..e581168ae6b 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -25,6 +25,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetSelect.h" +#include "llvm/Support/ScopedPrinter.h" // Other libraries and framework includes #include "DisassemblerLLVMC.h" @@ -595,7 +596,7 @@ public: } else { - ret.m_immediate = std::stoull(str, nullptr, 0); + ret.m_immediate = strtoull(str.c_str(), nullptr, 0); return std::make_pair(ret, osi); } case 'x': @@ -629,7 +630,7 @@ public: ++osi; } - ret.m_immediate = std::stoull(str, nullptr, 0); + ret.m_immediate = strtoull(str.c_str(), nullptr, 0); return std::make_pair(ret, osi); } @@ -880,7 +881,7 @@ public: { s.PutCString("-"); } - s.PutCString(std::to_string(op.m_immediate).c_str()); + s.PutCString(llvm::to_string(op.m_immediate).c_str()); break; case Operand::Type::Invalid: s.PutCString("Invalid"); diff --git a/lldb/source/Target/StopInfo.cpp b/lldb/source/Target/StopInfo.cpp index 085c0f181c0..68db6654d5d 100644 --- a/lldb/source/Target/StopInfo.cpp +++ b/lldb/source/Target/StopInfo.cpp @@ -1257,7 +1257,7 @@ StopInfo::GetCrashingDereference (StopInfoSP &stop_info_sp, lldb::addr_t *crashi address_loc += (sizeof(address_string) - 1); - uint64_t address = std::stoull(address_loc, 0, 0); + uint64_t address = strtoull(address_loc, 0, 0); if (crashing_address) { *crashing_address = address; |
