From: Eli Friedman <eli.friedman@gmail.com>
Date: Fri, 18 Dec 2009 21:38:44 +0000 (+0000)
Subject: Fix an issue in googletest where a name was used before it was defined.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5760f35e1517a660958116f8c4aa81d941e8def8;p=oota-llvm.git

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
---

diff --git a/utils/unittest/googletest/include/gtest/gtest-param-test.h b/utils/unittest/googletest/include/gtest/gtest-param-test.h
index 2d63237f562..0cf05dc7ed9 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.
 //