Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e890d37 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Drop String8::std_string" into main am: 9cbae9d7 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745821



Change-Id: I8d820356619fe8067c892586087e7d3263b9e8f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7bb2d38 9cbae9d7

libutils/include/utils/String16.h

+0 −8
Original line number Diff line number Diff line
@@ -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;

libutils/include/utils/String8.h

+0 −9
Original line number Diff line number Diff line
@@ -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();