From 872b9ceb6045949a5e8ab22221301e65fea3fe29 Mon Sep 17 00:00:00 2001
From: Joshua Cannon <joshdcannon@gmail.com>
Date: Mon, 7 Oct 2019 15:12:51 -0500
Subject: Avoid comma operator
---
googlemock/test/gmock-function-mocker_test.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'googlemock/test')
diff --git a/googlemock/test/gmock-function-mocker_test.cc b/googlemock/test/gmock-function-mocker_test.cc
index 4b41437e..efd2499d 100644
--- a/googlemock/test/gmock-function-mocker_test.cc
+++ b/googlemock/test/gmock-function-mocker_test.cc
@@ -664,7 +664,8 @@ struct MockMethodNoexceptSpecifier {
MOCK_METHOD(void, func5, (), (const, noexcept(noexcept(1+1))));
MOCK_METHOD(void, func6, (), (noexcept(noexcept(1+1)), const));
// Put commas in the noexcept expression
- MOCK_METHOD(void, func7, (), (noexcept(noexcept(1,2,3)), const));
+ void other_func(int, int) noexcept;
+ MOCK_METHOD(void, func7, (), (noexcept(noexcept(other_func(1,2))), const));
};
TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) {
@@ -674,7 +675,7 @@ TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) {
EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func4()), noexcept(1+1));
EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func5()), noexcept(1+1));
EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func6()), noexcept(1+1));
- EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func7()), noexcept(1,2,3));
+ EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func7()), noexcept(MockMethodNoexceptSpecifier{}.other_func(1,2)));
}
} // namespace gmock_function_mocker_test
--
cgit v1.2.3