Fixes an error when compiling with gcc 4.4.
This commit is contained in:
parent
3fbd2dd020
commit
946bc64fcf
@ -1083,7 +1083,7 @@ class FunctionMockerBase : public UntypedFunctionMockerBase {
|
|||||||
// called by the ON_CALL() and EXPECT_CALL() macros.
|
// called by the ON_CALL() and EXPECT_CALL() macros.
|
||||||
FunctionMocker<F>& RegisterOwner(const void* mock_obj) {
|
FunctionMocker<F>& RegisterOwner(const void* mock_obj) {
|
||||||
Mock::Register(mock_obj, this);
|
Mock::Register(mock_obj, this);
|
||||||
return *down_cast<FunctionMocker<F>*>(this);
|
return *::testing::internal::down_cast<FunctionMocker<F>*>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
// The following two functions are from UntypedFunctionMockerBase.
|
// The following two functions are from UntypedFunctionMockerBase.
|
||||||
|
Loading…
Reference in New Issue
Block a user