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

Commit c6ecd777 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Remove TODOs for std::string removal." am: ceb7814c am: 7170d5bf 

am: 3db7ef01

Change-Id: I527fa18f23bea5464481227bb35ec493be7eb199
parents 54f2e52a 3db7ef01

libutils/include/utils/String16.h

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public: 


    inline  const char16_t*     string() const;



//TODO(b/35363681): remove

private:

    static inline std::string   std_string(const String16& str);

public:

libutils/include/utils/String8.h

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public: 
    inline  const char*         c_str() const;

    inline  const char*         string() const;



// TODO(b/35363681): remove

private:

    static inline std::string   std_string(const String8& str);

public: