replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Second round of fixups for r280692 

Android targets don't have std::to_string and std::stoul. Use llvm::to_string and strtoul
instead.

llvm-svn: 280704
This commit is contained in:
Pavel Labath 2016-09-06 11:08:02 +00:00
parent ee44a92df6
commit de970cfb0c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
View File

@ -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");

2
lldb/source/Target/StopInfo.cpp
View File

@ -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;