diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-05 15:34:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 15:34:07 -0500 |
| commit | fab06101d709fe5e89cb2bd1f5c8a93085cecd6f (patch) | |
| tree | 859c913292e0026a50f1ba85f9a748d1468d2e4a /googlemock/src | |
| parent | 67476c1426dc520f1ff0eb16e6c00d050d489721 (diff) | |
| parent | 5b26b0fce73eda28890d1c9baff4eb4e5aa7d9d2 (diff) | |
| download | googletest-fab06101d709fe5e89cb2bd1f5c8a93085cecd6f.tar.gz googletest-fab06101d709fe5e89cb2bd1f5c8a93085cecd6f.tar.bz2 googletest-fab06101d709fe5e89cb2bd1f5c8a93085cecd6f.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index fc4968ba..93a83ae5 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -508,7 +508,7 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked() return expectations_met; } -CallReaction intToCallReaction(int mock_behavior) { +static CallReaction intToCallReaction(int mock_behavior) { if (mock_behavior >= kAllow && mock_behavior <= kFail) { return static_cast<internal::CallReaction>(mock_behavior); } |