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

Makes DoubleNear() print the diff between the actual and the expected value when the match fails.

Browse Source 
Also fix bogus MSVC warning about "alignment of a member was sensitive to packing".
Also bring in gtest 701.
This commit is contained in:
kosak
2015-01-08 02:38:14 +00:00
parent 61adbcc5c6
commit 6b81780310
3 changed files with 73 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/gmock/gmock-more-actions.h
View File

@@ -72,7 +72,7 @@ template <class Class, typename MethodPtr>
class InvokeMethodAction {
public:
InvokeMethodAction(Class* obj_ptr, MethodPtr method_ptr)
: obj_ptr_(obj_ptr), method_ptr_(method_ptr) {}
: method_ptr_(method_ptr), obj_ptr_(obj_ptr) {}
template <typename Result, typename ArgumentTuple>
Result Perform(const ArgumentTuple& args) const {
@@ -81,8 +81,11 @@ class InvokeMethodAction {
}
private:
Class* const obj_ptr_;
// The order of these members matters. Reversing the order can trigger
// warning C4121 in MSVC (see
// http://computer-programming-forum.com/7-vc.net/6fbc30265f860ad1.htm ).
const MethodPtr method_ptr_;
Class* const obj_ptr_;
GTEST_DISALLOW_ASSIGN_(InvokeMethodAction);
};