diff options
| author | 2014-05-19 16:49:03 -0700 | |
|---|---|---|
| committer | 2014-05-19 22:27:39 -0700 | |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /runtime/base/logging.cc | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
Now we have a proper C++ library, use std::unique_ptr.
Also remove the Android.libcxx.mk and other bits of stlport compatibility
mechanics.
Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61
Diffstat (limited to 'runtime/base/logging.cc')
| -rw-r--r-- | runtime/base/logging.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/base/logging.cc b/runtime/base/logging.cc index b6c6b9b2df..b2ad1d06d6 100644 --- a/runtime/base/logging.cc +++ b/runtime/base/logging.cc @@ -19,7 +19,6 @@ #include "base/mutex.h" #include "runtime.h" #include "thread-inl.h" -#include "UniquePtrCompat.h" #include "utils.h" namespace art { @@ -31,9 +30,9 @@ std::vector<std::string> gVerboseMethods; unsigned int gAborting = 0; static LogSeverity gMinimumLogSeverity = INFO; -static UniquePtr<std::string> gCmdLine; -static UniquePtr<std::string> gProgramInvocationName; -static UniquePtr<std::string> gProgramInvocationShortName; +static std::unique_ptr<std::string> gCmdLine; +static std::unique_ptr<std::string> gProgramInvocationName; +static std::unique_ptr<std::string> gProgramInvocationShortName; const char* GetCmdLine() { return (gCmdLine.get() != nullptr) ? gCmdLine->c_str() : nullptr; |