Skip to content

GitLab

Commit 3656c271 authored by Derek Mauro's avatar Derek Mauro Committed by Copybara-Service
Browse files

Fix redundant redeclaration warning 

Fixes #4200

PiperOrigin-RevId: 520017094
Change-Id: Id707a1c0489edde083771ccd412d7035612474dc
parent 13b19007
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
googlemock/include/gmock/internal/gmock-internal-utils.h
View file @ 3656c271
...@@ -465,8 +465,10 @@ struct Function<R(Args...)> { ...@@ -465,8 +465,10 @@ struct Function<R(Args...)> {
using MakeResultIgnoredValue = IgnoredValue(Args...); using MakeResultIgnoredValue = IgnoredValue(Args...);
}; };
#ifdef GTEST_INTERNAL_NEED_REDUNDANT_CONSTEXPR_DECL
template <typename R, typename... Args> template <typename R, typename... Args>
constexpr size_t Function<R(Args...)>::ArgumentCount; constexpr size_t Function<R(Args...)>::ArgumentCount;
#endif
// Workaround for MSVC error C2039: 'type': is not a member of 'std' // Workaround for MSVC error C2039: 'type': is not a member of 'std'
// when std::tuple_element is used. // when std::tuple_element is used.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment