diff options
| author | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2012-08-14 15:38:49 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2012-08-14 15:38:49 +0000 |
| commit | ada23475e27babd85fb9c13250243f6acfd3ffd8 (patch) | |
| tree | 8334b7536bfcabc9e184a77b5bb527881bea8aa6 /include | |
| parent | 2fd619edd3d1ec053f6276debdb513f1122ebcf3 (diff) | |
| download | googletest-ada23475e27babd85fb9c13250243f6acfd3ffd8.tar.gz googletest-ada23475e27babd85fb9c13250243f6acfd3ffd8.tar.bz2 googletest-ada23475e27babd85fb9c13250243f6acfd3ffd8.zip | |
Makes gmock's Pointee() work for optional<T> (by Jeffrey Yasskin).
Diffstat (limited to 'include')
| -rw-r--r-- | include/gmock/internal/gmock-internal-utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/internal/gmock-internal-utils.h b/include/gmock/internal/gmock-internal-utils.h index 6b6de970..d63fb223 100644 --- a/include/gmock/internal/gmock-internal-utils.h +++ b/include/gmock/internal/gmock-internal-utils.h @@ -73,7 +73,7 @@ struct PointeeOf<T*> { typedef T type; }; // NOLINT // smart pointer, or returns p itself when p is already a raw pointer. // The following default implementation is for the smart pointer case. template <typename Pointer> -inline typename Pointer::element_type* GetRawPointer(const Pointer& p) { +inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) { return p.get(); } // This overloaded version is for the raw pointer case. |