gtest: Fix build with gcc 4.7
Inclusion order has to be changed because of gcc
standards compliance fix.
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29131
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Change-Id: Ieea28ad3897f10901bce72bed8f0e536b961372e
diff --git a/include/gtest/gtest-param-test.h b/include/gtest/gtest-param-test.h
index 421517d..ee21fa4 100644
--- a/include/gtest/gtest-param-test.h
+++ b/include/gtest/gtest-param-test.h
@@ -155,7 +155,6 @@
#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 @@
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.
//
