diff options
| author | Tanzinul Islam <tanzislam@users.noreply.github.com> | 2018-03-05 02:25:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 02:25:59 +0000 |
| commit | a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (patch) | |
| tree | c6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/src/gmock-spec-builders.cc | |
| parent | 4ba3803f936a2f432e60841bc9358ea2f3a951eb (diff) | |
| parent | 6c73adfc03e277f55cb1e4947b3a5e6c5ff4fe46 (diff) | |
| download | googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.tar.gz googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.tar.bz2 googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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); } |