diff options
| author | Derek Mauro <dmauro@google.com> | 2023-03-28 07:02:23 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-28 07:03:07 -0700 |
| commit | 3656c2713e08bd5dadae740f71ef37a92336027b (patch) | |
| tree | c211de2ca799ce8693a6137b8c01fc2e2fa4bb4a | |
| parent | 13b1900717fe93238d615691b6d0d951b0e154c4 (diff) | |
| download | googletest-git-3656c2713e08bd5dadae740f71ef37a92336027b.tar.gz | |
Fix redundant redeclaration warning
Fixes #4200
PiperOrigin-RevId: 520017094
Change-Id: Id707a1c0489edde083771ccd412d7035612474dc
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index b5283ed0..d3444386 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -465,8 +465,10 @@ struct Function<R(Args...)> { using MakeResultIgnoredValue = IgnoredValue(Args...); }; +#ifdef GTEST_INTERNAL_NEED_REDUNDANT_CONSTEXPR_DECL template <typename R, typename... Args> constexpr size_t Function<R(Args...)>::ArgumentCount; +#endif // Workaround for MSVC error C2039: 'type': is not a member of 'std' // when std::tuple_element is used. |