summaryrefslogtreecommitdiffstats
path: root/googletest/src/gtest-internal-inl.h
diff options
context:
space:
mode:
authorHerbert Thielen <thielen@hs-worms.de>2017-09-04 17:38:35 (GMT)
committerHerbert Thielen <thielen@hs-worms.de>2017-09-04 17:38:35 (GMT)
commitaa0b5458a1c33b40f813013f3a6bbb928f8a3d9f (patch)
tree6eb4fe206c161c0cefb998cec4bcd4a4033408ae /googletest/src/gtest-internal-inl.h
parent7c6353d29a147cad1c904bf2957fd4ca2befe135 (diff)
downloadgoogletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.zip
googletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.tar.gz
googletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.tar.bz2
remove GTEST_HAS_PARAM_TESTS
As mentioned in issue #360: "Now that all the platforms gtest supports work with value-parameterized tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from the codebase everywhere." https://github.com/google/googletest/issues/360
Diffstat (limited to 'googletest/src/gtest-internal-inl.h')
-rw-r--r--googletest/src/gtest-internal-inl.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/googletest/src/gtest-internal-inl.h b/googletest/src/gtest-internal-inl.h
index 021feb1..1437293 100644
--- a/googletest/src/gtest-internal-inl.h
+++ b/googletest/src/gtest-internal-inl.h
@@ -664,13 +664,11 @@ class GTEST_API_ UnitTestImpl {
tear_down_tc)->AddTestInfo(test_info);
}
-#if GTEST_HAS_PARAM_TEST
// Returns ParameterizedTestCaseRegistry object used to keep track of
// value-parameterized tests and instantiate and register them.
internal::ParameterizedTestCaseRegistry& parameterized_test_registry() {
return parameterized_test_registry_;
}
-#endif // GTEST_HAS_PARAM_TEST
// Sets the TestCase object for the test that's currently running.
void set_current_test_case(TestCase* a_current_test_case) {
@@ -845,14 +843,12 @@ class GTEST_API_ UnitTestImpl {
// shuffled order.
std::vector<int> test_case_indices_;
-#if GTEST_HAS_PARAM_TEST
// ParameterizedTestRegistry object used to register value-parameterized
// tests.
internal::ParameterizedTestCaseRegistry parameterized_test_registry_;
// Indicates whether RegisterParameterizedTests() has been called already.
bool parameterized_tests_registered_;
-#endif // GTEST_HAS_PARAM_TEST
// Index of the last death test case registered. Initially -1.
int last_death_test_case_;