summaryrefslogtreecommitdiff
path: root/utils
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
commit5760f35e1517a660958116f8c4aa81d941e8def8 (patch)
tree0bf7a187ad2b1a9da3d4002420ac9dc460e75bf4 /utils
parent9ab2b98ba586b366ad49ea141d83b9821f91d8f3 (diff)
downloadllvm-5760f35e1517a660958116f8c4aa81d941e8def8.tar.gz
llvm-5760f35e1517a660958116f8c4aa81d941e8def8.tar.bz2
llvm-5760f35e1517a660958116f8c4aa81d941e8def8.tar.xz
Fix an issue in googletest where a name was used before it was defined.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91718 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r--utils/unittest/googletest/include/gtest/gtest-param-test.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/unittest/googletest/include/gtest/gtest-param-test.h b/utils/unittest/googletest/include/gtest/gtest-param-test.h
index 2d63237f56..0cf05dc7ed 100644
--- a/utils/unittest/googletest/include/gtest/gtest-param-test.h
+++ b/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.
//