diff options
| author | Treehugger Robot | 2017-08-02 15:35:45 -0500 |
|---|---|---|
| committer | Gerrit Code Review | 2017-08-02 15:35:45 -0500 |
| commit | ceb7814c8650c9dd1031ad6085d2ddb80914b6a9 (patch) | |
| tree | 37dc5a46f495bf47e7e92d33888643dd9bcb2080 /libutils/include | |
| parent | e7b8fc22af00bc7606289cbd10393e961855b2d1 (diff) | |
| parent | c8ddc2bad0bc29ce4bdd029aca15f1e593e2a0f1 (diff) | |
| download | platform-system-core-ceb7814c8650c9dd1031ad6085d2ddb80914b6a9.tar.gz platform-system-core-ceb7814c8650c9dd1031ad6085d2ddb80914b6a9.tar.xz platform-system-core-ceb7814c8650c9dd1031ad6085d2ddb80914b6a9.zip | |
Merge "Remove TODOs for std::string removal."
Diffstat (limited to 'libutils/include')
| -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: | |||
| 67 | 67 | ||
| 68 | inline const char16_t* string() const; | 68 | inline const char16_t* string() const; |
| 69 | 69 | ||
| 70 | //TODO(b/35363681): remove | ||
| 71 | private: | 70 | private: |
| 72 | static inline std::string std_string(const String16& str); | 71 | static inline std::string std_string(const String16& str); |
| 73 | public: | 72 | 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: | |||
| 67 | inline const char* c_str() const; | 67 | inline const char* c_str() const; |
| 68 | inline const char* string() const; | 68 | inline const char* string() const; |
| 69 | 69 | ||
| 70 | // TODO(b/35363681): remove | ||
| 71 | private: | 70 | private: |
| 72 | static inline std::string std_string(const String8& str); | 71 | static inline std::string std_string(const String8& str); |
| 73 | public: | 72 | public: |