aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBilly Donahue <BillyDonahue@users.noreply.github.com>2017-01-31 17:09:47 -0500
committerGitHub <noreply@github.com>2017-01-31 17:09:47 -0500
commitd62d6c6556d96dda924382547c54a4b3afedb22c (patch)
tree01320601cd79e640c7524ed2c17cbdd8cdf87063
parent9ae086a9ebafabdc49b71bb7f3879f551adee09a (diff)
parent06a81e9357b6e5cf023ac65b7468191cd1949d42 (diff)
downloadgoogletest-d62d6c6556d96dda924382547c54a4b3afedb22c.tar.gz
googletest-d62d6c6556d96dda924382547c54a4b3afedb22c.tar.bz2
googletest-d62d6c6556d96dda924382547c54a4b3afedb22c.zip
Merge pull request #982 from mbjorge/unused-variable-fix
Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_P
-rw-r--r--googletest/include/gtest/gtest-typed-test.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/googletest/include/gtest/gtest-typed-test.h b/googletest/include/gtest/gtest-typed-test.h
index 5f69d567..f4be9e55 100644
--- a/googletest/include/gtest/gtest-typed-test.h
+++ b/googletest/include/gtest/gtest-typed-test.h
@@ -241,9 +241,10 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
namespace GTEST_CASE_NAMESPACE_(CaseName) { \
typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \
} \
- static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) = \
- GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames(\
- __FILE__, __LINE__, #__VA_ARGS__)
+ static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) \
+ GTEST_ATTRIBUTE_UNUSED = \
+ GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames(\
+ __FILE__, __LINE__, #__VA_ARGS__)
// The 'Types' template argument below must have spaces around it
// since some compilers may choke on '>>' when passing a template