diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-11 11:57:28 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-11 11:57:28 -0700 |
| commit | fd5f0270e58eec02a4b23981d18ad9d74113a5d6 (patch) | |
| tree | 277c3afe6235bf013490f7de08fddb1d84da7e33 | |
| parent | e6eec1e862a0765a93bba93870fc4bb086865b57 (diff) | |
| parent | 624efe61c31c1bb6e532a8f09b4d56f9b2376984 (diff) | |
| download | gtest-ics-plus-aosp.tar.gz | |
Merge "gtest: Fix build with gcc 4.7"android-sdk-adt_r20tools_r20ics-plus-aosp
| -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. // |