From b66923ab2d0deb82ca35dcdcb7f577bb0b887372 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 21 Nov 2022 15:49:17 -0800 Subject: Switch to C++20 Prepare for using std::array<> and std::span<> in headers included from this library. Remove the AFont constructors to prevent that the build fails as follows: frameworks/base/native/android/system_fonts.cpp:265:35: error: no matching member function for call to 'insert' fonts.insert( ~~~~~~^~~~~~ Removing these constructors is necessary because of the following rule: "An aggregate is one of the following types [...] class type (struct or union) that has [...] no user-declared or inherited constructors (since C++20)". Source: https://en.cppreference.com/w/cpp/language/aggregate_initialization. Bug: 260725458 Change-Id: I384d05f5d3e471f8f58294119d04eb8ab16697ba Signed-off-by: Bart Van Assche --- native/android/Android.bp | 1 + native/android/system_fonts.cpp | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'native/android') diff --git a/native/android/Android.bp b/native/android/Android.bp index 8594ba5ca2da..f1b1d79265de 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -34,6 +34,7 @@ ndk_library { cc_defaults { name: "libandroid_defaults", + cpp_std: "gnu++20", cflags: [ "-Wall", "-Werror", diff --git a/native/android/system_fonts.cpp b/native/android/system_fonts.cpp index 9fe792958cef..8e90a6572478 100644 --- a/native/android/system_fonts.cpp +++ b/native/android/system_fonts.cpp @@ -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 { -- cgit v1.2.3-59-g8ed1b