Fix misc-macro-parentheses warnings in connectivity/sl4n.
* Add parentheses around parameters beside operators.
* Use NOLINT to suppress wrong clang-tidy warnings.
Bug: 28705665
Change-Id: I2787ac2d703ef83f7fd04b8d95df2ba37b8f2de5
Test: build with clang-tidy
diff --git a/sl4n/rapidjson/include/rapidjson/encodings.h b/sl4n/rapidjson/include/rapidjson/encodings.h
index bc3cd81..20ad8cb 100644
--- a/sl4n/rapidjson/include/rapidjson/encodings.h
+++ b/sl4n/rapidjson/include/rapidjson/encodings.h
@@ -123,7 +123,7 @@
template <typename InputStream>
static bool Decode(InputStream& is, unsigned* codepoint) {
#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | ((unsigned char)c & 0x3Fu)
-#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
+#define TRANS(mask) result &= ((GetRange((unsigned char)c) & (mask)) != 0)
#define TAIL() COPY(); TRANS(0x70)
Ch c = is.Take();
if (!(c & 0x80)) {
@@ -152,7 +152,7 @@
template <typename InputStream, typename OutputStream>
static bool Validate(InputStream& is, OutputStream& os) {
#define COPY() os.Put(c = is.Take())
-#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
+#define TRANS(mask) result &= ((GetRange((unsigned char)c) & (mask)) != 0)
#define TAIL() COPY(); TRANS(0x70)
Ch c;
COPY();
diff --git a/sl4n/rapidjson/include/rapidjson/internal/meta.h b/sl4n/rapidjson/include/rapidjson/internal/meta.h
index 2daad96..23323fa 100644
--- a/sl4n/rapidjson/include/rapidjson/internal/meta.h
+++ b/sl4n/rapidjson/include/rapidjson/internal/meta.h
@@ -148,17 +148,20 @@
template <typename T> struct RemoveSfinaeTag;
template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type; };
+// NOLINT: Do not add parentheses around 'type'.
#define RAPIDJSON_REMOVEFPTR_(type) \
typename ::RAPIDJSON_NAMESPACE::internal::RemoveSfinaeTag \
- < ::RAPIDJSON_NAMESPACE::internal::SfinaeTag&(*) type>::Type
+ < ::RAPIDJSON_NAMESPACE::internal::SfinaeTag&(*) type>::Type // NOLINT
+// NOLINT: Do not add parentheses around a statement.
#define RAPIDJSON_ENABLEIF(cond) \
typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
- <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
+ <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL // NOLINT
+// NOLINT: Do not add parentheses around a statement.
#define RAPIDJSON_DISABLEIF(cond) \
typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
- <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
+ <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL // NOLINT
#define RAPIDJSON_ENABLEIF_RETURN(cond,returntype) \
typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
