Fix misc-macro-parentheses warnings in system/bt.
* Use NOLINT to suppress missing parentheses warnings around bitmask.
Bug: 28705665
Test: make with WITH_TIDY=1 WITH_TIDY_CHECKS=-*,misc-macro-* \
WITH_TIDY_FLAGS=-header-filter=system/bt/.*
Change-Id: I4f095898d49eafdea9eb72f9ffc9eac87f68a4c8
diff --git a/osi/test/leaky_bonded_queue_test.cc b/osi/test/leaky_bonded_queue_test.cc
index c538101..6b54923 100644
--- a/osi/test/leaky_bonded_queue_test.cc
+++ b/osi/test/leaky_bonded_queue_test.cc
@@ -26,10 +26,10 @@
using system_bt_osi::LeakyBondedQueue;
-#define ITEM_EQ(a, b) \
- do { \
- EXPECT_EQ(a, b); \
- EXPECT_EQ(a->index, b->index); \
+#define ITEM_EQ(a, b) \
+ do { \
+ EXPECT_EQ(a, b); \
+ EXPECT_EQ((a)->index, (b)->index); \
} while (0)
class Item {
diff --git a/osi/test/metrics_test.cc b/osi/test/metrics_test.cc
index a8de2fc..787c0c2 100644
--- a/osi/test/metrics_test.cc
+++ b/osi/test/metrics_test.cc
@@ -170,19 +170,19 @@
}
}
-#define COMPARE_A2DP_METRICS(a, b) \
- do { \
- EXPECT_EQ(a.audio_duration_ms, b.audio_duration_ms); \
- EXPECT_EQ(a.media_timer_min_ms, b.media_timer_min_ms); \
- EXPECT_EQ(a.media_timer_max_ms, b.media_timer_max_ms); \
- EXPECT_EQ(a.media_timer_avg_ms, b.media_timer_avg_ms); \
- EXPECT_EQ(a.total_scheduling_count, b.total_scheduling_count); \
- EXPECT_EQ(a.buffer_overruns_max_count, b.buffer_overruns_max_count); \
- EXPECT_EQ(a.buffer_overruns_total, b.buffer_overruns_total); \
- EXPECT_THAT(a.buffer_underruns_average, \
- FloatNear(b.buffer_underruns_average, 0.01)); \
- a.buffer_underruns_average = b.buffer_underruns_average; \
- EXPECT_EQ(a.buffer_underruns_count, b.buffer_underruns_count); \
+#define COMPARE_A2DP_METRICS(a, b) \
+ do { \
+ EXPECT_EQ((a).audio_duration_ms, (b).audio_duration_ms); \
+ EXPECT_EQ((a).media_timer_min_ms, (b).media_timer_min_ms); \
+ EXPECT_EQ((a).media_timer_max_ms, (b).media_timer_max_ms); \
+ EXPECT_EQ((a).media_timer_avg_ms, (b).media_timer_avg_ms); \
+ EXPECT_EQ((a).total_scheduling_count, (b).total_scheduling_count); \
+ EXPECT_EQ((a).buffer_overruns_max_count, (b).buffer_overruns_max_count); \
+ EXPECT_EQ((a).buffer_overruns_total, (b).buffer_overruns_total); \
+ EXPECT_THAT((a).buffer_underruns_average, \
+ FloatNear((b).buffer_underruns_average, 0.01)); \
+ (a).buffer_underruns_average = (b).buffer_underruns_average; \
+ EXPECT_EQ((a).buffer_underruns_count, (b).buffer_underruns_count); \
} while (0)
/*