diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:02:11 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:02:11 +0000 |
| commit | 190f8ee25a6977ac6eb71b816498df42f17ad9a7 (patch) | |
| tree | 658b8c02fce43448931b29c311631a0fda983ed6 /utils/unittest/googletest/include/gtest/gtest-param-test.h | |
| parent | e4b9c93fc1b531fe0cfe25a042f6b81c1e7c15c0 (diff) | |
Merge gtest-1.4.0.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105353 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest/googletest/include/gtest/gtest-param-test.h')
| -rw-r--r-- | utils/unittest/googletest/include/gtest/gtest-param-test.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/unittest/googletest/include/gtest/gtest-param-test.h b/utils/unittest/googletest/include/gtest/gtest-param-test.h index c9d4f2455a..032885d315 100644 --- a/utils/unittest/googletest/include/gtest/gtest-param-test.h +++ b/utils/unittest/googletest/include/gtest/gtest-param-test.h @@ -146,10 +146,11 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); #endif // 0 +#include <gtest/internal/gtest-port.h> +#if !GTEST_OS_SYMBIAN #include <utility> - -#include <gtest/internal/gtest-port.h> +#endif #if GTEST_HAS_PARAM_TEST |