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

Commit b23651d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Drop String::empty()" into main am: 47fc3df9 am: 68c2432f am: 17379e43 

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



Change-Id: I89bd08cebbb0ba7c9938ce79b1eeee120efd9f4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5196fed4 17379e43

libutils/include/utils/String8.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -52,8 +52,6 @@ public: 
    explicit                    String8(const char32_t* o, size_t numChars);

    explicit                    String8(const char32_t* o, size_t numChars);

                                ~String8();

                                ~String8();





    static inline const String8 empty();



    static String8              format(const char* fmt, ...) __attribute__((format (printf, 1, 2)));

    static String8              format(const char* fmt, ...) __attribute__((format (printf, 1, 2)));

    static String8              formatV(const char* fmt, va_list args);

    static String8              formatV(const char* fmt, va_list args);
@@ -240,10 +238,6 @@ inline int strictly_order_type(const String8& lhs, const String8& rhs) 
    return compare_type(lhs, rhs) < 0;

    return compare_type(lhs, rhs) < 0;

}

}





inline const String8 String8::empty() {

    return String8();

}



inline const char* String8::c_str() const

inline const char* String8::c_str() const

{

{

    return mString;

    return mString;