summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/internal/gtest-internal.h
diff options
context:
space:
mode:
authorBrian Gianforcaro <b.gianfo@gmail.com>2019-11-16 01:26:47 (GMT)
committerBrian Gianforcaro <b.gianfo@gmail.com>2019-11-16 01:41:40 (GMT)
commit0c469a5a065e5db8093e0abd1a31648e9b459360 (patch)
tree12d87a41867de138de412cb9d093272dcfca678e /googletest/include/gtest/internal/gtest-internal.h
parentc27acebba3b3c7d94209e0467b0a801db4af73ed (diff)
downloadgoogletest-0c469a5a065e5db8093e0abd1a31648e9b459360.zip
googletest-0c469a5a065e5db8093e0abd1a31648e9b459360.tar.gz
googletest-0c469a5a065e5db8093e0abd1a31648e9b459360.tar.bz2
Fix FlatTuple compilation on older msvc.refs/pull/2569/head
googletest 1.10.0 fails to compile on msvc version 19.00.23917 with one compilation error: src\googletest\include\gtest\internal\gtest-internal.h(1188) : error C2039: 'FlatTupleBase<testing::internal::FlatTuple<bool,bool>,testing::internal::IndexSequence<0,1> >': is not a member of 'testing::internal::FlatTuple<bool,bool>' This PR fixes the compilation error by explicitly specifying the full type that Indices is located in the base type.
Diffstat (limited to 'googletest/include/gtest/internal/gtest-internal.h')
-rw-r--r--googletest/include/gtest/internal/gtest-internal.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h
index f9da489..6175bca 100644
--- a/googletest/include/gtest/internal/gtest-internal.h
+++ b/googletest/include/gtest/internal/gtest-internal.h
@@ -1185,7 +1185,7 @@ struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
// Analog to std::tuple but with different tradeoffs.
// This class minimizes the template instantiation depth, thus allowing more
-// elements that std::tuple would. std::tuple has been seen to require an
+// elements than std::tuple would. std::tuple has been seen to require an
// instantiation depth of more than 10x the number of elements in some
// implementations.
// FlatTuple and ElemFromList are not recursive and have a fixed depth
@@ -1196,7 +1196,9 @@ template <typename... T>
class FlatTuple
: private FlatTupleBase<FlatTuple<T...>,
typename MakeIndexSequence<sizeof...(T)>::type> {
- using Indices = typename FlatTuple::FlatTupleBase::Indices;
+
+ using Indices = typename FlatTupleBase<FlatTuple<T...>,
+ typename MakeIndexSequence<sizeof...(T)>::type>::Indices;
public:
FlatTuple() = default;