aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/internal/gmock-internal-utils.h
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-15 10:17:09 -0700
committerGitHub <noreply@github.com>2018-08-15 10:17:09 -0700
commit06b975928878a7a10cd4bc2bb35d2738e453f4a1 (patch)
treeb0c5b19fce9ae66b8071bd1b3b9a1e2175365358 /googlemock/include/gmock/internal/gmock-internal-utils.h
parent51b65058ad72d2d92fff89f04aad99f8bbddb147 (diff)
parent997d343dd680e541ef96ce71ee54a91daf2577a0 (diff)
downloadgoogletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.tar.gz
googletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.tar.bz2
googletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.zip
Merge branch 'master' into ignore-cmake-generated-files
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
-rw-r--r--googlemock/include/gmock/internal/gmock-internal-utils.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h
index e0846d9b..db64c65c 100644
--- a/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/googlemock/include/gmock/internal/gmock-internal-utils.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.
//
@@ -361,7 +360,7 @@ class WithoutMatchers {
// Internal use only: access the singleton instance of WithoutMatchers.
GTEST_API_ WithoutMatchers GetWithoutMatchers();
-// TODO(wan@google.com): group all type utilities together.
+// FIXME: group all type utilities together.
// Type traits.