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

Commit a7acd5d5 authored by Bart Van Assche's avatar Bart Van Assche Committed by Gerrit Code Review
Browse files

Merge "Switch to C++20"

parents a6971bc9 b66923ab

core/jni/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ cc_library_shared { 


    cppflags: ["-Wno-conversion-null"],



    cpp_std: "gnu++20",



    srcs: [

        "android_animation_PropertyValuesHolder.cpp",

        "android_os_SystemClock.cpp",

native/android/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ ndk_library { 


cc_defaults {

    name: "libandroid_defaults",

    cpp_std: "gnu++20",

    cflags: [

        "-Wall",

        "-Werror",

native/android/system_fonts.cpp

+0 −3
Original line number Diff line number Diff line
@@ -66,9 +66,6 @@ struct AFont { 
        return mFilePath == o.mFilePath && mLocale == o.mLocale && mWeight == o.mWeight &&

                mItalic == o.mItalic && mCollectionIndex == o.mCollectionIndex && mAxes == o.mAxes;

    }



    AFont() = default;

    AFont(const AFont&) = default;

};



struct FontHasher {