Merge "Remove TODOs for std::string removal." am: ceb7814c86
am: 7170d5bf24
am: 3db7ef0168
am: c6ecd7770e
Change-Id: I2c36ff383fca7f1490eb2418fd1175db8ca9bc43
This commit is contained in:
commit
ee270761c9
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue