Merge "Remove TODOs for std::string removal."
am: ceb7814c86
Change-Id: Iab64291aec5edd44ebf8856fb2d24c6d0e779bed
This commit is contained in:
commit
7170d5bf24
2 changed files with 0 additions and 2 deletions
|
|
@ -67,7 +67,6 @@ public:
|
||||||
|
|
||||||
inline const char16_t* string() const;
|
inline const char16_t* string() const;
|
||||||
|
|
||||||
//TODO(b/35363681): remove
|
|
||||||
private:
|
private:
|
||||||
static inline std::string std_string(const String16& str);
|
static inline std::string std_string(const String16& str);
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,6 @@ public:
|
||||||
inline const char* c_str() const;
|
inline const char* c_str() const;
|
||||||
inline const char* string() const;
|
inline const char* string() const;
|
||||||
|
|
||||||
// TODO(b/35363681): remove
|
|
||||||
private:
|
private:
|
||||||
static inline std::string std_string(const String8& str);
|
static inline std::string std_string(const String8& str);
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue