diff options
author | Abseil Team <absl-team@google.com> | 2018-12-03 19:55:34 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-12-04 14:45:03 (GMT) |
commit | 3d71ab4c37de5f13da905a4b60c127176160537d (patch) | |
tree | 961eb8a6ba22c823e7d6a13e3feeb49b4cefa5c6 /googlemock/include | |
parent | 3fd66989bb5c70010e8bfe175be35e014fd444c6 (diff) | |
download | googletest-3d71ab4c37de5f13da905a4b60c127176160537d.zip googletest-3d71ab4c37de5f13da905a4b60c127176160537d.tar.gz googletest-3d71ab4c37de5f13da905a4b60c127176160537d.tar.bz2 |
Googletest export
Deduce SizeType for SizeIs() from the return value of the size() member function
PiperOrigin-RevId: 223835674
Diffstat (limited to 'googlemock/include')
-rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 801c8df..b859f1a 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -1955,9 +1955,7 @@ class SizeIsMatcher { template <typename Container> class Impl : public MatcherInterface<Container> { public: - typedef internal::StlContainerView< - GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView; - typedef typename ContainerView::type::size_type SizeType; + using SizeType = decltype(std::declval<Container>().size()); explicit Impl(const SizeMatcher& size_matcher) : size_matcher_(MatcherCast<SizeType>(size_matcher)) {} |