diff options
author | Tomasz Wasilczyk <twasilczyk@google.com> | 2023-09-08 18:17:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-09-08 18:17:25 +0000 |
commit | 9cbae9d75bcb531a12d0a5b23088f396091690cd (patch) | |
tree | b4415901401e5e4f524eadbbf4d4af624882fbb6 /libutils | |
parent | acc7ff19f995a41e3033d841c2f0051b2fd25269 (diff) | |
parent | adaf33026a32e336dd727cb4d03e9cd656c2869c (diff) | |
download | core-9cbae9d75bcb531a12d0a5b23088f396091690cd.tar.gz |
Merge "Drop String8::std_string" into main
Diffstat (limited to 'libutils')
-rw-r--r-- | libutils/include/utils/String16.h | 8 | ||||
-rw-r--r-- | libutils/include/utils/String8.h | 9 |
2 files changed, 0 insertions, 17 deletions
diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h index b48b90765..ec2a3241c 100644 --- a/libutils/include/utils/String16.h +++ b/libutils/include/utils/String16.h @@ -56,9 +56,6 @@ public: inline const char16_t* c_str() const; inline const char16_t* string() const; -private: - static inline std::string std_string(const String16& str); -public: size_t size() const; inline bool empty() const; @@ -249,11 +246,6 @@ inline const char16_t* String16::string() const return mString; } -inline std::string String16::std_string(const String16& str) -{ - return std::string(String8(str).c_str()); -} - inline bool String16::empty() const { return length() == 0; diff --git a/libutils/include/utils/String8.h b/libutils/include/utils/String8.h index ea25c6aa3..2a3d679d0 100644 --- a/libutils/include/utils/String8.h +++ b/libutils/include/utils/String8.h @@ -58,10 +58,6 @@ public: inline const char* c_str() const; inline const char* string() const; -private: - static inline std::string std_string(const String8& str); -public: - inline size_t size() const; inline size_t bytes() const; inline bool empty() const; @@ -239,11 +235,6 @@ inline const char* String8::string() const return mString; } -inline std::string String8::std_string(const String8& str) -{ - return std::string(str.c_str()); -} - inline size_t String8::size() const { return length(); |