summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/gtest-param-test.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/include/gtest/gtest-param-test.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/include/gtest/gtest-param-test.h')
-rw-r--r--googletest/include/gtest/gtest-param-test.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/googletest/include/gtest/gtest-param-test.h b/googletest/include/gtest/gtest-param-test.h
index 038f9ba..7548a7c 100644
--- a/googletest/include/gtest/gtest-param-test.h
+++ b/googletest/include/gtest/gtest-param-test.h
@@ -185,15 +185,10 @@ TEST_P(DerivedTest, DoesBlah) {
# include <utility>
#endif
-// scripts/fuse_gtest.py depends on gtest's own header being #included
-// *unconditionally*. Therefore these #includes cannot be moved
-// inside #if GTEST_HAS_PARAM_TEST.
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-param-util.h"
#include "gtest/internal/gtest-param-util-generated.h"
-#if GTEST_HAS_PARAM_TEST
-
namespace testing {
// Functions producing parameter generators.
@@ -1439,6 +1434,4 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
} // namespace testing
-#endif // GTEST_HAS_PARAM_TEST
-
#endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_