| commit | 4fe7d5f42f7b15a7836bb3b72e4ce29b8d5055f2 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Aug 02 21:04:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 21:04:48 2017 +0000 |
| tree | 78d16a988f12b2903ded37ff9b8139c32667b111 | |
| parent | eaad3caaab59c05600e8ecc427ebaed5bfddba09 [diff] | |
| parent | 95814669b2df6d9ac80b832bdfde13e2ce280477 [diff] |
Merge "Remove TODOs for std::string removal." am: ceb7814c86 am: 7170d5bf24 am: 3db7ef0168 am: c6ecd7770e Change-Id: I2c36ff383fca7f1490eb2418fd1175db8ca9bc43
diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h index f6433a8..cb3d338 100644 --- a/libutils/include/utils/String16.h +++ b/libutils/include/utils/String16.h
@@ -67,7 +67,6 @@ 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 f5f9219..1f3e5d8 100644 --- a/libutils/include/utils/String8.h +++ b/libutils/include/utils/String8.h
@@ -67,7 +67,6 @@ 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: