gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allows Field() and Property() to work when the matcher argument is a pointer passed by reference.

Browse Source
This commit is contained in:
zhanyong.wan
2010-01-13 05:15:07 +00:00
parent e122e457a6
commit 6953a725fc
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/gmock/gmock-matchers.h
View File

@@ -1784,7 +1784,8 @@ template <typename Class, typename FieldType, typename T>
bool MatchAndExplain(const FieldMatcher<Class, FieldType>& matcher,
T& value, MatchResultListener* listener) {
return matcher.MatchAndExplain(
typename ::testing::internal::is_pointer<T>::type(), value, listener);
typename ::testing::internal::is_pointer<GMOCK_REMOVE_CONST_(T)>::type(),
value, listener);
}
// Implements the Property() matcher for matching a property
@@ -1849,7 +1850,8 @@ template <typename Class, typename PropertyType, typename T>
bool MatchAndExplain(const PropertyMatcher<Class, PropertyType>& matcher,
T& value, MatchResultListener* listener) {
return matcher.MatchAndExplain(
typename ::testing::internal::is_pointer<T>::type(), value, listener);
typename ::testing::internal::is_pointer<GMOCK_REMOVE_CONST_(T)>::type(),
value, listener);
}
// Type traits specifying various features of different functors for ResultOf.
@@ -2018,7 +2020,8 @@ class ContainerEqMatcher {
*os << "Only in actual: ";
printed_header = true;
}
UniversalPrinter<typename LhsStlContainer::value_type>::Print(*it, os);
UniversalPrinter<typename LhsStlContainer::value_type>::
Print(*it, os);
}
}