aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2010-10-05 05:58:51 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2010-10-05 05:58:51 +0000
commit5921483640fed07d8dcfff9cc34fe353fec55f26 (patch)
tree03baf2cdbb67f20554195355eb0f12d078d29288 /include
parent662d8a23502173db60e2d9d600c508e06d8ba173 (diff)
downloadgoogletest-5921483640fed07d8dcfff9cc34fe353fec55f26.tar.gz
googletest-5921483640fed07d8dcfff9cc34fe353fec55f26.tar.bz2
googletest-5921483640fed07d8dcfff9cc34fe353fec55f26.zip
Adds SetArgPointee to replace SetArgumentPointee.
Diffstat (limited to 'include')
-rw-r--r--include/gmock/gmock-actions.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h
index 6eb3f445..1d5509ce 100644
--- a/include/gmock/gmock-actions.h
+++ b/include/gmock/gmock-actions.h
@@ -1016,6 +1016,15 @@ template <size_t N, typename T>
PolymorphicAction<
internal::SetArgumentPointeeAction<
N, T, internal::IsAProtocolMessage<T>::value> >
+SetArgPointee(const T& x) {
+ return MakePolymorphicAction(internal::SetArgumentPointeeAction<
+ N, T, internal::IsAProtocolMessage<T>::value>(x));
+}
+// The following version is DEPRECATED.
+template <size_t N, typename T>
+PolymorphicAction<
+ internal::SetArgumentPointeeAction<
+ N, T, internal::IsAProtocolMessage<T>::value> >
SetArgumentPointee(const T& x) {
return MakePolymorphicAction(internal::SetArgumentPointeeAction<
N, T, internal::IsAProtocolMessage<T>::value>(x));