diff options
| author | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-11-17 18:50:37 +0100 |
|---|---|---|
| committer | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-11-22 17:17:41 +0100 |
| commit | 6748df1eab1dd741a6deffcdd5012d521c1d3a46 (patch) | |
| tree | 42ed87df87c612aa5ec5e4c9ed1d3bb832cc72f1 | |
| parent | f9665846e405664bec650d77f9dd236c61a293b0 (diff) | |
| download | googletest-6748df1eab1dd741a6deffcdd5012d521c1d3a46.tar.gz googletest-6748df1eab1dd741a6deffcdd5012d521c1d3a46.tar.bz2 googletest-6748df1eab1dd741a6deffcdd5012d521c1d3a46.zip | |
remove MSVC workaround: cease const dropping
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index b8ec24dd..133033bc 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -4057,11 +4057,8 @@ template <typename Container> inline PolymorphicMatcher<internal::ContainerEqMatcher< typename std::remove_const<Container>::type>> ContainerEq(const Container& rhs) { - // This following line is for working around a bug in MSVC 8.0, - // which causes Container to be a const type sometimes. - typedef typename std::remove_const<Container>::type RawContainer; return MakePolymorphicMatcher( - internal::ContainerEqMatcher<RawContainer>(rhs)); + internal::ContainerEqMatcher<Container>(rhs)); } // Returns a matcher that matches a container that, when sorted using @@ -4094,11 +4091,7 @@ template <typename TupleMatcher, typename Container> inline internal::PointwiseMatcher<TupleMatcher, typename std::remove_const<Container>::type> Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) { - // This following line is for working around a bug in MSVC 8.0, - // which causes Container to be a const type sometimes (e.g. when - // rhs is a const int[]).. - typedef typename std::remove_const<Container>::type RawContainer; - return internal::PointwiseMatcher<TupleMatcher, RawContainer>( + return internal::PointwiseMatcher<TupleMatcher, Container>( tuple_matcher, rhs); } @@ -4130,14 +4123,10 @@ inline internal::UnorderedElementsAreArrayMatcher< typename std::remove_const<RhsContainer>::type>::type::value_type>> UnorderedPointwise(const Tuple2Matcher& tuple2_matcher, const RhsContainer& rhs_container) { - // This following line is for working around a bug in MSVC 8.0, - // which causes RhsContainer to be a const type sometimes (e.g. when - // rhs_container is a const int[]). - typedef typename std::remove_const<RhsContainer>::type RawRhsContainer; // RhsView allows the same code to handle RhsContainer being a // STL-style container and it being a native C-style array. - typedef typename internal::StlContainerView<RawRhsContainer> RhsView; + typedef typename internal::StlContainerView<RhsContainer> RhsView; typedef typename RhsView::type RhsStlContainer; typedef typename RhsStlContainer::value_type Second; const RhsStlContainer& rhs_stl_container = |