commit fa333e774676692c43e96872473d51eeae6b3643
author Chih-hung Hsieh <chh@google.com> Thu Dec 13 18:06:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 13 18:06:30 2018 +0000
tree faccdb88c60e179cac14d10a0c8b9442d4794522
parent 8cfa3edfeae1eb17e6bc8aa5d7998bd94283f422
parent cbf9bf7b7349d6c6eaf22534f54ef4eb918ca11a

Merge "Fix cert-dcl16-c clang-tidy warnings"

test/hidl_test/static_test.cpp

diff --git a/test/hidl_test/static_test.cpp b/test/hidl_test/static_test.cpp
index 3222f03..3d9f3f0 100644
--- a/test/hidl_test/static_test.cpp
+++ b/test/hidl_test/static_test.cpp
@@ -115,7 +115,7 @@
 static_assert(IExpression::UInt64LiteralTypeGuessing::noSuffixHex1 == 0x7fffffff, "");
 static_assert(IExpression::UInt64LiteralTypeGuessing::noSuffixHex2 == 0x80000000, "");
 static_assert(IExpression::UInt64LiteralTypeGuessing::noSuffixHex3 == 0xffffffff, "");
-static_assert(IExpression::UInt64LiteralTypeGuessing::longHex1 == 0xffffffffl, "");
+static_assert(IExpression::UInt64LiteralTypeGuessing::longHex1 == 0xffffffffL, "");
 static_assert(IExpression::UInt64LiteralTypeGuessing::longHex2 == 0Xfffffffff, "");
 static_assert(IExpression::UInt64LiteralTypeGuessing::longHex3 == 0x7fffffffffffffff, "");
 static_assert(IExpression::UInt64LiteralTypeGuessing::longHex4 == 0x8000000000000000, "");
@@ -151,7 +151,7 @@
 static_assert(IExpression::Precedence::neg == (-4), "");
 static_assert(IExpression::Precedence::literalL == (-4L), "");
 static_assert(IExpression::Precedence::hex == (0xffffffff), "");
-static_assert(IExpression::Precedence::hexLong == (0xffffffffl), "");
+static_assert(IExpression::Precedence::hexLong == (0xffffffffL), "");
 static_assert(IExpression::Precedence::hexLong2 == (0xfffffffff), "");
 static_assert(IExpression::Precedence::simpleArithmetic == (4 + 1), "");
 static_assert(IExpression::Precedence::simpleArithmetic2 == (2 + 3 - 4), "");

test/java_test/hidl_test_java_native.cpp

diff --git a/test/java_test/hidl_test_java_native.cpp b/test/java_test/hidl_test_java_native.cpp
index a83a803..a7467d7 100644
--- a/test/java_test/hidl_test_java_native.cpp
+++ b/test/java_test/hidl_test_java_native.cpp
@@ -439,7 +439,7 @@
 }
 
 TEST_F(HidlTest, BazDoQuiteABitMethodTest) {
-    auto result = baz->doQuiteABit(1, 2ll, 3.0f, 4.0);
+    auto result = baz->doQuiteABit(1, 2LL, 3.0f, 4.0);
 
     EXPECT_OK(result);
     EXPECT_EQ(result, 666.5);