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

Commit de42a92e authored Jan 08, 2025 by Ryan Prichard

Revert "Fix the Wenum-constexpr-conversion error"

This reverts commit 7c275a89.

The clang-r547379 update removes the -Wenum-constexpr-conversion flag
and emits an error unconditionally (llvm.org/pr59036).

Bug: b/379133546
Test: m mediasyncevent_tests synchronizedrecordstate_tests
Change-Id: Ib896eb4dd46ee74bfd2d62d28f4d7cf6dd33e2a1

parent 78a63413

services/audioflinger/timing/tests/mediasyncevent_tests.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -25,8 +25,7 @@ using namespace android;
		using namespace android::audioflinger;

		namespace {
		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wenum-constexpr-conversion"

		TEST(MediaSyncEventTests, Basic) {
		struct Cookie : public RefBase {};

		@@ -67,5 +66,5 @@ TEST(MediaSyncEventTests, Basic) {
		syncEvent->cancel();
		ASSERT_TRUE(syncEvent->isCancelled());
		}
		#pragma clang diagnostic pop

		} // namespace

services/audioflinger/timing/tests/synchronizedrecordstate_tests.cpp

+1 −3

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ using namespace android::audioflinger;

		namespace {

		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wenum-constexpr-conversion"
		TEST(SynchronizedRecordStateTests, Basic) {
		struct Cookie : public RefBase {};

		@@ -76,5 +74,5 @@ TEST(SynchronizedRecordStateTests, Basic) {
		ASSERT_FALSE(triggered);
		ASSERT_TRUE(syncEvent->isCancelled());
		}
		#pragma clang diagnostic pop

		}