diff options
| author | drgler <daniel.kruegler@gmail.com> | 2017-08-22 20:19:13 +0200 |
|---|---|---|
| committer | drgler <daniel.kruegler@gmail.com> | 2017-08-22 21:13:32 +0200 |
| commit | d93ce9d6fb8ea690239c69be6cbc58099a55ec13 (patch) | |
| tree | 65575eed9d0e5e39686efe40d530c45c00851b9d /googlemock/include/gmock/gmock-matchers.h | |
| parent | 6404d45a92528cb0a8f8294d4c0b057c23138de5 (diff) | |
| parent | 8304d06199bdfb13bfb7613db9b5231141300e25 (diff) | |
| download | googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.tar.gz googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.tar.bz2 googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.zip | |
Merge branch 'master' of github.com:Dani-Hub/googletest
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 2 |
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; |