diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-03 11:06:20 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-03 11:06:20 -0400 |
| commit | 2cedd5b9c1815610da3adebbea8c94c30570c96c (patch) | |
| tree | 6bf6a46f7b5ef5afed6c0c1ee036f0f8996a7b07 | |
| parent | 04d1e56bd23d4e1a1dc168f0eea96b81f6f5df40 (diff) | |
| download | googletest-2cedd5b9c1815610da3adebbea8c94c30570c96c.tar.gz googletest-2cedd5b9c1815610da3adebbea8c94c30570c96c.zip | |
merging gtest-port.h , 191439094
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 74be06b3..f7a8d9dd 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -667,6 +667,10 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; // Determines whether Google Test's own tr1 tuple implementation // should be used. #ifndef GTEST_USE_OWN_TR1_TUPLE +// We use our own tuple implementation on Symbian. +# if GTEST_OS_SYMBIAN +# define GTEST_USE_OWN_TR1_TUPLE 1 +# else // The user didn't tell us, so we need to figure it out. // We use our own TR1 tuple if we aren't sure the user has an @@ -697,12 +701,11 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; # else # define GTEST_USE_OWN_TR1_TUPLE 1 # endif - +# endif // GTEST_OS_SYMBIAN #endif // GTEST_USE_OWN_TR1_TUPLE -// To avoid conditional compilation everywhere, we make it -// gtest-port.h's responsibility to #include the header implementing -// tuple. +// To avoid conditional compilation we make it gtest-port.h's responsibility +// to #include the header implementing tuple. #if GTEST_HAS_STD_TUPLE_ # include <tuple> // IWYU pragma: export # define GTEST_TUPLE_NAMESPACE_ ::std |
