summaryrefslogtreecommitdiffstats
path: root/googlemock/include
diff options
context:
space:
mode:
authorHector Dearman <hjd@google.com>2017-06-19 17:27:33 (GMT)
committerHector Dearman <hjd@google.com>2017-06-19 17:27:33 (GMT)
commit24054ff0737836a1e937bee7c3acb41471cc4555 (patch)
tree99aee893bfffec937e812fbb7c7b1f1e76f97333 /googlemock/include
parentc2d90bddc6a2a562ee7750c14351e9ca16a6a37a (diff)
downloadgoogletest-24054ff0737836a1e937bee7c3acb41471cc4555.zip
googletest-24054ff0737836a1e937bee7c3acb41471cc4555.tar.gz
googletest-24054ff0737836a1e937bee7c3acb41471cc4555.tar.bz2
Fixed misspelling in assertion message.refs/pull/1122/head
This upstreams a Google-internal change (146491438).
Diffstat (limited to 'googlemock/include')
-rw-r--r--googlemock/include/gmock/gmock-matchers.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index 9ade5b6..3a97c43 100644
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -646,7 +646,7 @@ class SafeMatcherCastImpl {
// type U.
GTEST_COMPILE_ASSERT_(
internal::is_reference<T>::value || !internal::is_reference<U>::value,
- cannot_convert_non_referentce_arg_to_reference);
+ cannot_convert_non_reference_arg_to_reference);
// In case both T and U are arithmetic types, enforce that the
// conversion is not lossy.
typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT;