diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-17 23:58:45 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-17 23:58:45 +0100 |
| commit | 9d77e63e125a24e8ba6cbe02b40681a37f59cd5f (patch) | |
| tree | 5b4f48b7b3fd7c99e702774ffc53da0f3822613e /googlemock/include/gmock/gmock-spec-builders.h | |
| parent | 1cd979a80701a6c8c370f3a69048ba5cbec62a28 (diff) | |
| parent | e82d320567a45db1a999f9109f2b9a733bc59bb1 (diff) | |
| download | googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.tar.gz googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.tar.bz2 googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 9670b59c..0d83cd6f 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // Google Mock - a framework for writing C++ mock classes. // @@ -185,7 +184,7 @@ 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. - // TODO(wan@google.com): rename to SetAndRegisterOwner(). + // FIXME: rename to SetAndRegisterOwner(). void RegisterOwner(const void* mock_obj) GTEST_LOCK_EXCLUDED_(g_gmock_mutex); @@ -1208,7 +1207,7 @@ class TypedExpectation : public ExpectationBase { mocker->DescribeDefaultActionTo(args, what); DescribeCallCountTo(why); - // TODO(wan@google.com): allow the user to control whether + // FIXME: allow the user to control whether // unexpected calls should fail immediately or continue using a // flag --gmock_unexpected_calls_are_fatal. return NULL; |