diff options
| author | dmauro <dmauro@google.com> | 2020-10-13 19:23:57 (GMT) |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2020-10-14 22:26:15 (GMT) |
| commit | fb239f0e4c0e73970a55f824eb53bd3ab773056a (patch) | |
| tree | 6a37c294500164f761dea07a23788b03b76b4376 /googletest/include | |
| parent | b55f834c57535ec72b10f5516b8a1531be1a5f02 (diff) | |
| download | googletest-fb239f0e4c0e73970a55f824eb53bd3ab773056a.zip googletest-fb239f0e4c0e73970a55f824eb53bd3ab773056a.tar.gz googletest-fb239f0e4c0e73970a55f824eb53bd3ab773056a.tar.bz2 | |
Googletest export
Fix -Wmismatched-tags error with struct tuple_size vs class tuple_size
PiperOrigin-RevId: 336930166
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index 08a9f9b..738e6c3 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -1325,8 +1325,8 @@ constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; } namespace std { template <typename... Ts> -struct tuple_size<testing::internal::FlatTuple<Ts...>> - : std::integral_constant<size_t, sizeof...(Ts)> {}; +class tuple_size<testing::internal::FlatTuple<Ts...>> + : public std::integral_constant<size_t, sizeof...(Ts)> {}; } // namespace std |