summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-11-20 19:16:54 (GMT)
committerGennadiy Civil <misterg@google.com>2019-11-20 19:16:54 (GMT)
commit200ff599496e20f4e39566feeaf2f6734ca7570f (patch)
tree0feab12c4f2cd8ec4d02cdb8ae4f0712fb2c4dbd
parent4bf466236dbe1db812fab9264d800175eec1cd24 (diff)
parent0c469a5a065e5db8093e0abd1a31648e9b459360 (diff)
downloadgoogletest-200ff599496e20f4e39566feeaf2f6734ca7570f.zip
googletest-200ff599496e20f4e39566feeaf2f6734ca7570f.tar.gz
googletest-200ff599496e20f4e39566feeaf2f6734ca7570f.tar.bz2
Merge pull request #2569 from bgianfo:master
PiperOrigin-RevId: 281321427
-rw-r--r--googletest/include/gtest/internal/gtest-internal.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h
index f9da489..44b037a 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,8 @@ 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;