diff options
| author | David Schuldenfrei <david.schuldenfrei@gmail.com> | 2018-09-12 07:43:50 (GMT) |
|---|---|---|
| committer | David Schuldenfrei <david.schuldenfrei@gmail.com> | 2018-09-12 07:43:50 (GMT) |
| commit | e1d41f3f9f3d8c1b6987ce849120677c380e7f87 (patch) | |
| tree | dd555a7f54d18b6ea91926cf5d29e5091bb15d7a | |
| parent | a2a15f2cefcfceaa6cee5b674a9b447359268ee9 (diff) | |
| download | googletest-e1d41f3f9f3d8c1b6987ce849120677c380e7f87.zip googletest-e1d41f3f9f3d8c1b6987ce849120677c380e7f87.tar.gz googletest-e1d41f3f9f3d8c1b6987ce849120677c380e7f87.tar.bz2 | |
Gennadiy's comment. Reverts to previous code if not using Visual Studio 2013refs/pull/1817/head
| -rw-r--r-- | googletest/include/gtest/gtest-printers.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index 3fddf83..71f2aae 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -983,7 +983,11 @@ struct TuplePolicy { template <size_t I> static typename AddReference<const typename ::std::tr1::tuple_element< +#if defined(_MSC_VER) && _MSC_VER < 1900 I, Tuple>::type>::type +#else + static_cast<int>(I), Tuple>::type>::type +#endif get(const Tuple& tuple) { return ::std::tr1::get<I>(tuple); } |