Remove Android.h
It only contained a reimplementation of std::to_string, which I have replaced with usages of
pre-existing llvm::to_string (also, injecting members into the std namespace is evil).
llvm-svn: 278000
diff --git a/lldb/source/Host/common/HostInfoBase.cpp b/lldb/source/Host/common/HostInfoBase.cpp
index 2bff4d9..3fcd31e 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 @@
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 62bf536..53d74d5 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 @@
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)
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index 9d6b976f..340ea86 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -33,6 +33,7 @@
#include "lldb/Target/Platform.h"
#include "lldb/Target/Process.h"
#include "llvm/ADT/SmallString.h"
+#include "llvm/Support/ScopedPrinter.h"
// Project includes
#include "ProcessGDBRemoteLog.h"
@@ -1250,7 +1251,7 @@
}
int write_fd = socket_pipe.GetWriteFileDescriptor();
debugserver_args.AppendArgument("--pipe");
- debugserver_args.AppendArgument(std::to_string(write_fd).c_str());
+ debugserver_args.AppendArgument(llvm::to_string(write_fd).c_str());
launch_info.AppendCloseFileAction(socket_pipe.GetReadFileDescriptor());
#endif
}
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
index 1052cb8..3135bd8 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
@@ -21,8 +21,6 @@
#include <thread>
// Other libraries and framework includes
-#include "llvm/ADT/Triple.h"
-#include "lldb/Interpreter/Args.h"
#include "lldb/Core/DataBuffer.h"
#include "lldb/Core/Log.h"
#include "lldb/Core/RegisterValue.h"
@@ -37,13 +35,16 @@
#include "lldb/Host/HostInfo.h"
#include "lldb/Host/StringConvert.h"
#include "lldb/Host/TimeValue.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeRegisterContext.h"
+#include "lldb/Host/common/NativeThreadProtocol.h"
+#include "lldb/Interpreter/Args.h"
#include "lldb/Target/FileAction.h"
#include "lldb/Target/MemoryRegionInfo.h"
-#include "lldb/Host/common/NativeRegisterContext.h"
-#include "lldb/Host/common/NativeProcessProtocol.h"
-#include "lldb/Host/common/NativeThreadProtocol.h"
#include "lldb/Utility/JSON.h"
#include "lldb/Utility/LLDBAssert.h"
+#include "llvm/ADT/Triple.h"
+#include "llvm/Support/ScopedPrinter.h"
// Project includes
#include "Utility/StringExtractorGDBRemote.h"
@@ -490,8 +491,7 @@
StreamString stream;
WriteRegisterValueInHexFixedWidth(stream, reg_ctx_sp, *reg_info_p, ®_value);
- register_object_sp->SetObject(std::to_string(reg_num),
- std::make_shared<JSONString>(stream.GetString()));
+ register_object_sp->SetObject(llvm::to_string(reg_num), std::make_shared<JSONString>(stream.GetString()));
}
return register_object_sp;
diff --git a/lldb/source/Utility/PseudoTerminal.cpp b/lldb/source/Utility/PseudoTerminal.cpp
index bc3cfee..94c75da 100644
--- a/lldb/source/Utility/PseudoTerminal.cpp
+++ b/lldb/source/Utility/PseudoTerminal.cpp
@@ -33,7 +33,6 @@
pid_t fork(void) { return 0; }
pid_t setsid(void) { return 0; }
#elif defined(__ANDROID_NDK__)
-#include "lldb/Host/android/Android.h"
int posix_openpt(int flags);
#endif