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

Commit 3db7ef01 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

Change-Id: Ibb86fe114ddd5b20bb343018f90775d90e66ad38
parents 3cdb21a8 7170d5bf

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: