Commit 872b9ceb authored by Joshua Cannon's avatar Joshua Cannon
Browse files

Avoid comma operator

parent 0eadff8a
...@@ -664,7 +664,8 @@ struct MockMethodNoexceptSpecifier { ...@@ -664,7 +664,8 @@ struct MockMethodNoexceptSpecifier {
MOCK_METHOD(void, func5, (), (const, noexcept(noexcept(1+1)))); MOCK_METHOD(void, func5, (), (const, noexcept(noexcept(1+1))));
MOCK_METHOD(void, func6, (), (noexcept(noexcept(1+1)), const)); MOCK_METHOD(void, func6, (), (noexcept(noexcept(1+1)), const));
// Put commas in the noexcept expression // 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) { TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) {
...@@ -674,7 +675,7 @@ TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) { ...@@ -674,7 +675,7 @@ TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) {
EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func4()), noexcept(1+1)); EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func4()), noexcept(1+1));
EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func5()), noexcept(1+1)); EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func5()), noexcept(1+1));
EXPECT_EQ(noexcept(MockMethodNoexceptSpecifier{}.func6()), 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 } // namespace gmock_function_mocker_test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment