summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorGeorgi D. Sotirov <gdsotirov@dir.bg>2018-09-12 07:44:52 (GMT)
committerGitHub <noreply@github.com>2018-09-12 07:44:52 (GMT)
commit94046c91db2967bf98a2eb8ecdfe8accac77ee46 (patch)
tree0e7e27c2f2fb0180495c9101cdaf9212c0e07f9c /googletest
parent4d066127be19bda5faa92386806d5f572e72c4b7 (diff)
downloadgoogletest-94046c91db2967bf98a2eb8ecdfe8accac77ee46.zip
googletest-94046c91db2967bf98a2eb8ecdfe8accac77ee46.tar.gz
googletest-94046c91db2967bf98a2eb8ecdfe8accac77ee46.tar.bz2
Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env to avoide comilation error (with -Werror)
The unused attribute was removed with commit 3299a23 on 2018-02-23, but it currently breaks build of 1.8.1, because of -Werror GCC parameter as reported in issue #1825.
Diffstat (limited to 'googletest')
-rw-r--r--googletest/test/gtest_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index f7213fb..fa10224 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -2117,7 +2117,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment {
};
// This will test property recording outside of any test or test case.
-static Environment* record_property_env =
+static Environment* record_property_env GTEST_ATTRIBUTE_UNUSED_ =
AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment);
// This group of tests is for predicate assertions (ASSERT_PRED*, etc)