gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2569 from bgianfo:master

Browse Source 
PiperOrigin-RevId: 281321427
This commit is contained in:
Gennadiy Civil
2019-11-20 14:16:54 -05:00
parent 4bf466236d 0c469a5a06
commit 200ff59949
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
googletest/include/gtest/internal/gtest-internal.h
View File

@@ -1185,7 +1185,7 @@ struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
// Analog to std::tuple but with different tradeoffs. // Analog to std::tuple but with different tradeoffs.
// This class minimizes the template instantiation depth, thus allowing more // 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 // instantiation depth of more than 10x the number of elements in some
// implementations. // implementations.
// FlatTuple and ElemFromList are not recursive and have a fixed depth // FlatTuple and ElemFromList are not recursive and have a fixed depth
@@ -1196,7 +1196,8 @@ template <typename... T>
class FlatTuple class FlatTuple
: private FlatTupleBase<FlatTuple<T...>, : private FlatTupleBase<FlatTuple<T...>,
typename MakeIndexSequence<sizeof...(T)>::type> { typename MakeIndexSequence<sizeof...(T)>::type> {
using Indices = typename FlatTuple::FlatTupleBase::Indices; using Indices = typename FlatTupleBase<
FlatTuple<T...>, typename MakeIndexSequence<sizeof...(T)>::type>::Indices;
public: public:
FlatTuple() = default; FlatTuple() = default;