summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-spec-builders.h
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2019-01-02 21:50:02 (GMT)
committerGennadiy Civil <misterg@google.com>2019-01-02 21:51:40 (GMT)
commit14c2fba7349e1f84e506dd6eab2835a8023d0f05 (patch)
tree153a958225111f1d08d970dc457252097fa42be2 /googlemock/include/gmock/gmock-spec-builders.h
parentf8b1c1af17750189b83c58f360c85268c0d95105 (diff)
downloadgoogletest-14c2fba7349e1f84e506dd6eab2835a8023d0f05.zip
googletest-14c2fba7349e1f84e506dd6eab2835a8023d0f05.tar.gz
googletest-14c2fba7349e1f84e506dd6eab2835a8023d0f05.tar.bz2
Googletest export
Internal Change PiperOrigin-RevId: 227575279
Diffstat (limited to 'googlemock/include/gmock/gmock-spec-builders.h')
-rw-r--r--googlemock/include/gmock/gmock-spec-builders.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h
index 9a54b3a..526fe7a 100644
--- a/googlemock/include/gmock/gmock-spec-builders.h
+++ b/googlemock/include/gmock/gmock-spec-builders.h
@@ -186,7 +186,6 @@ class GTEST_API_ UntypedFunctionMockerBase {
// this information in the global mock registry. Will be called
// whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
// method.
- // FIXME: rename to SetAndRegisterOwner().
void RegisterOwner(const void* mock_obj)
GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
@@ -1197,9 +1196,6 @@ class TypedExpectation : public ExpectationBase {
mocker->DescribeDefaultActionTo(args, what);
DescribeCallCountTo(why);
- // FIXME: allow the user to control whether
- // unexpected calls should fail immediately or continue using a
- // flag --gmock_unexpected_calls_are_fatal.
return nullptr;
}