summaryrefslogtreecommitdiffstats
path: root/llvm/utils/unittest/googletest/include
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2009-12-18 21:38:44 +0000
committerEli Friedman <eli.friedman@gmail.com>2009-12-18 21:38:44 +0000
commit36623cc253f1af4914d088bcf975944d820e1f71 (patch)
treef772a03e6e77a6559cdc33a42ad8b3421d762351 /llvm/utils/unittest/googletest/include
parentb175de63564876dcdaf9883587eb8d90b76bbb90 (diff)
downloadbcm5719-llvm-36623cc253f1af4914d088bcf975944d820e1f71.tar.gz
bcm5719-llvm-36623cc253f1af4914d088bcf975944d820e1f71.zip
Fix an issue in googletest where a name was used before it was defined.
llvm-svn: 91718
Diffstat (limited to 'llvm/utils/unittest/googletest/include')
-rw-r--r--llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h b/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
index 2d63237f562..0cf05dc7ed9 100644
--- a/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
+++ b/llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
@@ -155,7 +155,6 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
#include <gtest/internal/gtest-internal.h>
#include <gtest/internal/gtest-param-util.h>
-#include <gtest/internal/gtest-param-util-generated.h>
namespace testing {
@@ -289,6 +288,12 @@ internal::ParamGenerator<typename Container::value_type> ValuesIn(
return ValuesIn(container.begin(), container.end());
}
+} // namespace testing
+
+#include <gtest/internal/gtest-param-util-generated.h>
+
+namespace testing {
+
// Values() allows generating tests from explicitly specified list of
// parameters.
//
OpenPOWER on IntegriCloud