aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-08 16:15:57 -0400
committerGitHub <noreply@github.com>2017-08-08 16:15:57 -0400
commitaadf53d2a2c1791e466f0303319fc0cfbe87d46d (patch)
tree9b1835194f5e9064bb6ca8168941d371d274d850
parent6ae9cc7894ad9ce037d47d116327c045d3ff3c43 (diff)
parent24054ff0737836a1e937bee7c3acb41471cc4555 (diff)
downloadgoogletest-aadf53d2a2c1791e466f0303319fc0cfbe87d46d.tar.gz
googletest-aadf53d2a2c1791e466f0303319fc0cfbe87d46d.tar.bz2
googletest-aadf53d2a2c1791e466f0303319fc0cfbe87d46d.zip
Merge pull request #1122 from chromy/upstream-146491438
Fixed misspelling in assertion message.
-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 9ade5b64..3a97c438 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;