From: Pavel Labath Date: Mon, 8 Aug 2016 12:54:36 +0000 (+0000) Subject: Remove Android.h X-Git-Tag: llvmorg-4.0.0-rc1~13069 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1eb0d42a1b64ff7aa5d36af2df30fef929fead6f;p=platform%2Fupstream%2Fllvm.git 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/include/lldb/Host/android/Android.h b/lldb/include/lldb/Host/android/Android.h deleted file mode 100644 index 08e7dd9..0000000 --- a/lldb/include/lldb/Host/android/Android.h +++ /dev/null @@ -1,28 +0,0 @@ -//===-- lldb-android.h --------------------------------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef LLDB_lldb_android_h_ -#define LLDB_lldb_android_h_ - -#include -#include -#include - -namespace std -{ - template - std::string to_string(T value) - { - std::ostringstream os ; - os << value ; - return os.str() ; - } -} - -#endif // LLDB_lldb_android_h_ diff --git a/lldb/include/lldb/lldb-private.h b/lldb/include/lldb/lldb-private.h index cd6f147..8cc585f 100644 --- a/lldb/include/lldb/lldb-private.h +++ b/lldb/include/lldb/lldb-private.h @@ -16,10 +16,6 @@ #include "lldb/Host/windows/win32.h" #endif -#ifdef __ANDROID_NDK__ -#include "lldb/Host/android/Android.h" -#endif - #include "lldb/lldb-public.h" #include "lldb/lldb-private-enumerations.h" #include "lldb/lldb-private-interfaces.h" 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 @@ -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 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 @@ 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) 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 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *url, } 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 // 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/Target/FileAction.h" -#include "lldb/Target/MemoryRegionInfo.h" -#include "lldb/Host/common/NativeRegisterContext.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/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 @@ GetRegistersAsJSON(NativeThreadProtocol &thread, bool abridged) StreamString stream; WriteRegisterValueInHexFixedWidth(stream, reg_ctx_sp, *reg_info_p, ®_value); - register_object_sp->SetObject(std::to_string(reg_num), - std::make_shared(stream.GetString())); + register_object_sp->SetObject(llvm::to_string(reg_num), std::make_shared(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 @@ char *ptsname(int fd) { return 0; } 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 diff --git a/lldb/tools/lldb-server/Acceptor.cpp b/lldb/tools/lldb-server/Acceptor.cpp index 6343195..1bf86eb 100644 --- a/lldb/tools/lldb-server/Acceptor.cpp +++ b/lldb/tools/lldb-server/Acceptor.cpp @@ -10,6 +10,7 @@ #include "Acceptor.h" #include "llvm/ADT/StringRef.h" +#include "llvm/Support/ScopedPrinter.h" #include "lldb/Core/StreamString.h" #include "lldb/Host/ConnectionFileDescriptor.h" @@ -142,7 +143,7 @@ Acceptor::Create(StringRef name, const bool child_processes_inherit, Error &erro TCPSocket* tcp_socket = static_cast(listener_socket_up.get()); local_socket_id = [tcp_socket]() { auto local_port = tcp_socket->GetLocalPortNumber(); - return (local_port != 0) ? std::to_string(local_port) : ""; + return (local_port != 0) ? llvm::to_string(local_port) : ""; }; } else