diff options
| author | Steven Moreland <smoreland@google.com> | 2017-08-02 20:49:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-02 20:49:46 +0000 |
| commit | 7170d5bf24e59651f2ea87c59109fe298a71f8b2 (patch) | |
| tree | 527f1779f4e7fa9a368010cfebd8f4da3dc79f5d | |
| parent | 601e5ac55b4b3e82157d2e46ab2cfed1a29ce214 (diff) | |
| parent | ceb7814c8650c9dd1031ad6085d2ddb80914b6a9 (diff) | |
| download | system_core-7170d5bf24e59651f2ea87c59109fe298a71f8b2.tar.gz system_core-7170d5bf24e59651f2ea87c59109fe298a71f8b2.tar.bz2 system_core-7170d5bf24e59651f2ea87c59109fe298a71f8b2.zip | |
Merge "Remove TODOs for std::string removal."
am: ceb7814c86
Change-Id: Iab64291aec5edd44ebf8856fb2d24c6d0e779bed
| -rw-r--r-- | libutils/include/utils/String16.h | 1 | ||||
| -rw-r--r-- | libutils/include/utils/String8.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h index f6433a829..cb3d338f2 100644 --- a/libutils/include/utils/String16.h +++ b/libutils/include/utils/String16.h @@ -67,7 +67,6 @@ public: inline const char16_t* string() const; -//TODO(b/35363681): remove private: static inline std::string std_string(const String16& str); public: diff --git a/libutils/include/utils/String8.h b/libutils/include/utils/String8.h index f5f9219a1..1f3e5d865 100644 --- a/libutils/include/utils/String8.h +++ b/libutils/include/utils/String8.h @@ -67,7 +67,6 @@ public: inline const char* c_str() const; inline const char* string() const; -// TODO(b/35363681): remove private: static inline std::string std_string(const String8& str); public: |