diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-03-31 11:47:59 +0200 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-03-31 11:47:59 +0200 |
| commit | 624efe61c31c1bb6e532a8f09b4d56f9b2376984 (patch) | |
| tree | 277c3afe6235bf013490f7de08fddb1d84da7e33 | |
| parent | e6eec1e862a0765a93bba93870fc4bb086865b57 (diff) | |
| download | gtest-624efe61c31c1bb6e532a8f09b4d56f9b2376984.tar.gz | |
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
| -rw-r--r-- | include/gtest/gtest-param-test.h | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ 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. // |