diff options
Diffstat (limited to 'lldb/source/Host')
| -rw-r--r-- | lldb/source/Host/common/HostInfoBase.cpp | 5 | ||||
| -rw-r--r-- | lldb/source/Host/linux/Host.cpp | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lldb/source/Host/common/HostInfoBase.cpp b/lldb/source/Host/common/HostInfoBase.cpp index 2bff4d9a670..3fcd31e08f9 100644 --- a/lldb/source/Host/common/HostInfoBase.cpp +++ b/lldb/source/Host/common/HostInfoBase.cpp @@ -17,10 +17,11 @@ #include "lldb/Host/HostInfo.h" #include "lldb/Host/HostInfoBase.h" -#include "llvm/ADT/Triple.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/Triple.h" #include "llvm/Support/Host.h" #include "llvm/Support/Path.h" +#include "llvm/Support/ScopedPrinter.h" #include "llvm/Support/raw_ostream.h" #include <thread> @@ -334,7 +335,7 @@ HostInfoBase::ComputeProcessTempFileDirectory(FileSpec &file_spec) if (!HostInfo::ComputeGlobalTempFileDirectory(temp_file_spec)) return false; - std::string pid_str{std::to_string(Host::GetCurrentProcessID())}; + std::string pid_str{llvm::to_string(Host::GetCurrentProcessID())}; temp_file_spec.AppendPathComponent(pid_str); if (!FileSystem::MakeDirectory(temp_file_spec, eFilePermissionsDirectoryDefault).Success()) return false; diff --git a/lldb/source/Host/linux/Host.cpp b/lldb/source/Host/linux/Host.cpp index 62bf5362de0..53d74d55234 100644 --- a/lldb/source/Host/linux/Host.cpp +++ b/lldb/source/Host/linux/Host.cpp @@ -19,6 +19,7 @@ // C++ Includes // Other libraries and framework includes +#include "llvm/Support/ScopedPrinter.h" // Project includes #include "lldb/Core/Error.h" #include "lldb/Core/Log.h" @@ -26,9 +27,6 @@ #include "lldb/Host/Host.h" #include "lldb/Host/HostInfo.h" -#ifdef __ANDROID_NDK__ -#include "lldb/Host/android/Android.h" -#endif #include "lldb/Core/DataBufferHeap.h" #include "lldb/Core/DataExtractor.h" @@ -236,7 +234,7 @@ Host::FindProcessThreads (const lldb::pid_t pid, TidMap &tids_to_attach) bool tids_changed = false; static const char procdir[] = "/proc/"; static const char taskdir[] = "/task/"; - std::string process_task_dir = procdir + std::to_string(pid) + taskdir; + std::string process_task_dir = procdir + llvm::to_string(pid) + taskdir; DIR *dirproc = opendir (process_task_dir.c_str()); if (dirproc) |
