diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-01-12 16:00:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 16:00:39 +0000 |
| commit | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (patch) | |
| tree | e8cca8f555358fa2ed590a226c8a15a0354dbd80 /googlemock/src/gmock-spec-builders.cc | |
| parent | 8f90d46c8cdd743759821a1c987a70e826d58cef (diff) | |
| parent | ed8d02cfc689f26b65e6deb585561c59615b05de (diff) | |
| download | googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.gz googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.bz2 googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.zip | |
Merge branch 'master' into fix-argc
Diffstat (limited to 'googlemock/src/gmock-spec-builders.cc')
| -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); } |