From 9007cca051519cfeef8ea1744d0785c8fbba54ea Mon Sep 17 00:00:00 2001 From: Henri Chataing Date: Mon, 6 Nov 2023 17:43:05 +0000 Subject: [PATCH] Update to fmtlib 10.1.1 fmtlib 10+ removes the automatic formatting of enum classes to the underlying class, requesting that a custom formatter be provided for the type. Normally fmt::underlying could be used to convert the enum value to its backing type, but this change automerges to udc-mainline-prod where the helper does not exist. Bug: 310046696 Test: m Change-Id: I62f3a66dd2f8e3d288dc4c0298d4f3bfa57a6a71 --- tests/native/utilities/firewall.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/native/utilities/firewall.cpp b/tests/native/utilities/firewall.cpp index 22f83e8ed4..669b76a47f 100644 --- a/tests/native/utilities/firewall.cpp +++ b/tests/native/utilities/firewall.cpp @@ -59,9 +59,11 @@ Result Firewall::toggleStandbyMatch(bool enable) { Result Firewall::addRule(uint32_t uid, UidOwnerMatchType match, uint32_t iif) { // iif should be non-zero if and only if match == MATCH_IIF if (match == IIF_MATCH && iif == 0) { - return Errorf("Interface match {} must have nonzero interface index", match); + return Errorf("Interface match {} must have nonzero interface index", + static_cast(match)); } else if (match != IIF_MATCH && iif != 0) { - return Errorf("Non-interface match {} must have zero interface index", match); + return Errorf("Non-interface match {} must have zero interface index", + static_cast(match)); } std::lock_guard guard(mMutex);