diff options
| author | Stepan Khapugin <stkhapugin@users.noreply.github.com> | 2017-09-08 09:46:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 09:46:31 (GMT) |
| commit | 6508a66622b458b43184ee814c714d76d5976f75 (patch) | |
| tree | 69547e850b6266368e2290fc46aa18c7d7907841 /googletest | |
| parent | e43a5948d51edbb78595c30d6fd1db6736156ddf (diff) | |
| parent | 894cdb82cb2a1141bde8710a67ea4c5325d1d202 (diff) | |
| download | googletest-6508a66622b458b43184ee814c714d76d5976f75.zip googletest-6508a66622b458b43184ee814c714d76d5976f75.tar.gz googletest-6508a66622b458b43184ee814c714d76d5976f75.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 2 | ||||
| -rw-r--r-- | googletest/test/gtest-param-test_test.cc | 4 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index ce94733..9915c11 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -98,7 +98,7 @@ macro(config_compiler_and_linker) set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0") set(cxx_no_rtti_flags "-GR-") elseif (CMAKE_COMPILER_IS_GNUCXX) - set(cxx_base_flags "-Wall -Wshadow") + set(cxx_base_flags "-Wall -Wshadow -Werror") set(cxx_exception_flags "-fexceptions") set(cxx_no_exception_flags "-fno-exceptions") # Until version 4.3.2, GCC doesn't define a macro to indicate diff --git a/googletest/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc index 857f6c5..d1b0644 100644 --- a/googletest/test/gtest-param-test_test.cc +++ b/googletest/test/gtest-param-test_test.cc @@ -857,8 +857,8 @@ TEST_P(CustomLambdaNamingTest, CustomTestNames) {} INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest, Values(std::string("LambdaName")), - [](const ::testing::TestParamInfo<std::string>& info) { - return info.param; + [](const ::testing::TestParamInfo<std::string>& tpinfo) { + return tpinfo.param; }); #endif // GTEST_LANG_CXX11 diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index f84def9..745c950 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -2096,7 +2096,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment { }; // This will test property recording outside of any test or test case. -static Environment* record_property_env = +Environment* record_property_env GTEST_ATTRIBUTE_UNUSED_ = AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment); // This group of tests is for predicate assertions (ASSERT_PRED*, etc) |