Merge "gtest: Fix build with gcc 4.7"

CyanogenMod · Jun 11, 2012 · fd5f027 · fd5f027
2 parents e6eec1e + 624efe6
commit fd5f027
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/include/gtest/gtest-param-test.h b/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,10 @@ internal::ParamGenerator<typename Container::value_type> ValuesIn(
   return ValuesIn(container.begin(), container.end());
 }
 
+} // namespace testing
+#include <gtest/internal/gtest-param-util-generated.h> // Must be included after ValuesIn and friends are defined
+namespace testing { // And back in...
+
 // Values() allows generating tests from explicitly specified list of
 // parameters.
 //