From cdd83a0bb264f6c304f98749a621e9654457ebcc Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Fri, 17 Jun 2016 15:32:25 +0100 Subject: Fix warnings from gtest under GCC 5 or newer. Change-Id: I9661f2fe9d315dccae69caa70d929b5d9d93b7db (cherry picked from commit 4c83fdd3d7cacd66a2c64451db0fb64e5b2ecf48) --- third_party/googletest/README.libvpx | 6 +++++- third_party/googletest/src/include/gtest/gtest.h | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/third_party/googletest/README.libvpx b/third_party/googletest/README.libvpx index 7201a67d3..1eca78dd9 100644 --- a/third_party/googletest/README.libvpx +++ b/third_party/googletest/README.libvpx @@ -12,4 +12,8 @@ failures, various options for running the tests, and XML test report generation. Local Modifications: -Removed unused declarations of kPathSeparatorString to have warning free build. \ No newline at end of file +- Removed unused declarations of kPathSeparatorString to have warning + free build. +- Added GTEST_ATTRIBUTE_UNUSED_ to test registering dummies in TEST_P + and INSTANTIATE_TEST_CASE_P to remove warnings about unused variables + under GCC 5. \ No newline at end of file diff --git a/third_party/googletest/src/include/gtest/gtest.h b/third_party/googletest/src/include/gtest/gtest.h index 4f3804f70..581a44e95 100644 --- a/third_party/googletest/src/include/gtest/gtest.h +++ b/third_party/googletest/src/include/gtest/gtest.h @@ -16960,7 +16960,7 @@ internal::CartesianProductHolder10()); \ return 0; \ } \ - static int gtest_registering_dummy_; \ + static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \ GTEST_DISALLOW_COPY_AND_ASSIGN_(\ GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \ }; \ @@ -16972,7 +16972,7 @@ internal::CartesianProductHolder10 \ gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \ - int gtest_##prefix##test_case_name##_dummy_ = \ + int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ GetTestCasePatternHolder(\ #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\ -- cgit v1.2.3