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

Commit 87b50353 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I6b8c6204,I2ae00bb5 into main 

* changes:
  Revert "libmediautils: pin cpp_std to gnu++17"
  FixedString fix operator== conversion ambiguities
parents d49d1480 37b784a2

media/utils/include/mediautils/FixedString.h

+6 −1
Original line number Diff line number Diff line
@@ -101,10 +101,15 @@ struct FixedString 
        return strncmp(c_str(), s, capacity() + 1) == 0;

    }



    bool operator==(std::string_view s) const {

    bool operator==(const std::string_view s) const {

        return size() == s.size() && memcmp(data(), s.data(), size()) == 0;

    }



    template <uint32_t N_>

    bool operator==(const FixedString<N_>& s) const {

        return operator==(s.asStringView());

    }



    // operator not-equals

    template <typename T>

    bool operator!=(const T& other) const {

media/utils/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ cc_defaults { 


    host_supported: true,



    cpp_std: "gnu++17",

    cflags: [

        "-Wall",

        "-Werror",