diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-17 23:05:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 23:05:00 -0400 |
| commit | 85b572394b53f61b71ddb4cd69702b88d3332a55 (patch) | |
| tree | 2e10880e254f2135e217dedd111ebdec2f18dd3d | |
| parent | e82d320567a45db1a999f9109f2b9a733bc59bb1 (diff) | |
| parent | 2a380bc26db8e73fa0df2c8b375dcfbb0e3fa4c8 (diff) | |
| download | googletest-85b572394b53f61b71ddb4cd69702b88d3332a55.tar.gz googletest-85b572394b53f61b71ddb4cd69702b88d3332a55.tar.bz2 googletest-85b572394b53f61b71ddb4cd69702b88d3332a55.zip | |
Merge pull request #1652 from medithe/patch-1
Cast the tr1::tuple_element template parameter to int
| -rw-r--r-- | googletest/include/gtest/gtest-printers.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index c67e30a1..51865f84 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -978,12 +978,13 @@ struct TuplePolicy { static const size_t tuple_size = ::std::tr1::tuple_size<Tuple>::value; template <size_t I> - struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {}; + struct tuple_element : ::std::tr1::tuple_element<static_cast<int>(I), Tuple> { + }; template <size_t I> - static typename AddReference< - const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get( - const Tuple& tuple) { + static typename AddReference<const typename ::std::tr1::tuple_element< + static_cast<int>(I), Tuple>::type>::type + get(const Tuple& tuple) { return ::std::tr1::get<I>(tuple); } }; |