Merge "Drop String8::std_string" into main am: 9cbae9d75b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745821
Change-Id: I8d820356619fe8067c892586087e7d3263b9e8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h
index b48b907..ec2a324 100644
--- a/libutils/include/utils/String16.h
+++ b/libutils/include/utils/String16.h
@@ -56,9 +56,6 @@
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 @@
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 ea25c6a..2a3d679 100644
--- a/libutils/include/utils/String8.h
+++ b/libutils/include/utils/String8.h
@@ -58,10 +58,6 @@
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 @@
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();