aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-02-13 11:05:01 -0500
committerGennadiy Civil <misterg@google.com>2018-02-13 11:05:01 -0500
commit2a23ca00092bbb9c31d7a7b6fa9519bf2d8c70c7 (patch)
tree1a2cd79e993658e311f7e217f9deb759c9239e25
parenta66d209061ebdcf81ed93c1dd0336944514fd1df (diff)
downloadgoogletest-2a23ca00092bbb9c31d7a7b6fa9519bf2d8c70c7.tar.gz
googletest-2a23ca00092bbb9c31d7a7b6fa9519bf2d8c70c7.tar.bz2
googletest-2a23ca00092bbb9c31d7a7b6fa9519bf2d8c70c7.zip
https://travis-ci.org/google/googletest/jobs/340995238
-rw-r--r--googletest/test/gtest-param-test_test.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/googletest/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc
index 6e62dfa2..9d970d2e 100644
--- a/googletest/test/gtest-param-test_test.cc
+++ b/googletest/test/gtest-param-test_test.cc
@@ -556,7 +556,7 @@ TEST(CombineTest, NonDefaultConstructAssign) {
Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
NonDefaultConstructAssignString("B")));
- ParamGenerator<tuple<int, NonDefaultConstructAssignString>>::iterator it =
+ ParamGenerator<tuple<int, NonDefaultConstructAssignString> >::iterator it =
gen.begin();
EXPECT_EQ(0, std::get<0>(*it));
@@ -871,8 +871,8 @@ INSTANTIATE_TEST_CASE_P(AllAllowedCharacters,
CustomParamNameFunctor());
inline std::string CustomParamNameFunction(
- const ::testing::TestParamInfo<std::string>& info) {
- return info.param;
+ const ::testing::TestParamInfo<std::string>& inf) {
+ return inf.param;
}
class CustomFunctionNamingTest : public TestWithParam<std::string> {};
@@ -893,8 +893,8 @@ TEST_P(CustomLambdaNamingTest, CustomTestNames) {}
INSTANTIATE_TEST_CASE_P(CustomParamNameLambda,
CustomLambdaNamingTest,
Values(std::string("LambdaName")),
- [](const ::testing::TestParamInfo<std::string>& inf) {
- return inf.param;
+ [](const ::testing::TestParamInfo<std::string>& info) {
+ return info.param;
});
#endif // GTEST_LANG_CXX11