diff options
author | Josh Bodily <joshbodily@gmail.com> | 2017-12-12 17:36:37 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-12 17:36:37 (GMT) |
commit | 3e2cb75446e0f56f226f0fb259e032bb4d014002 (patch) | |
tree | 4d945ff84ee3affb3187acb1fbb8ba9d300718d8 /googlemock/src/gmock-internal-utils.cc | |
parent | cf85f56b2159d7c964dacb3e311163a6f9520688 (diff) | |
parent | 0fe96607d85cf3a25ac40da369db62bbee2939a5 (diff) | |
download | googletest-3e2cb75446e0f56f226f0fb259e032bb4d014002.zip googletest-3e2cb75446e0f56f226f0fb259e032bb4d014002.tar.gz googletest-3e2cb75446e0f56f226f0fb259e032bb4d014002.tar.bz2 |
Merge branch 'master' into josh/fix_scoped_class2
Diffstat (limited to 'googlemock/src/gmock-internal-utils.cc')
-rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc index 6464abc..91bf3fd 100644 --- a/googlemock/src/gmock-internal-utils.cc +++ b/googlemock/src/gmock-internal-utils.cc @@ -71,7 +71,7 @@ GTEST_API_ string ConvertIdentifierNameToWords(const char* id_name) { } // This class reports Google Mock failures as Google Test failures. A -// user can define another class in a similar fashion if he intends to +// user can define another class in a similar fashion if they intend to // use Google Mock with a testing framework other than Google Test. class GoogleTestFailureReporter : public FailureReporterInterface { public: |