diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-08-19 14:20:11 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-08-19 14:20:11 -0400 |
| commit | d5e9e0c38f85363e90b0a3e95a9484fe896d38e5 (patch) | |
| tree | 0670adc30cfc85a02e061e2391391d6855fcf12f /googlemock/include/gmock/gmock-matchers.h | |
| parent | 30e58a89a42b8bf98619ac16da2c515d042ca8ff (diff) | |
| parent | da76d01b984fcfd02cf7b368b6081c988937f336 (diff) | |
| download | googletest-d5e9e0c38f85363e90b0a3e95a9484fe896d38e5.tar.gz googletest-d5e9e0c38f85363e90b0a3e95a9484fe896d38e5.tar.bz2 googletest-d5e9e0c38f85363e90b0a3e95a9484fe896d38e5.zip | |
Merge pull request #2397 from kuzkry:custom-type-traits-is_reference
PiperOrigin-RevId: 264193098
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 70750827..874151b7 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -280,7 +280,7 @@ class SafeMatcherCastImpl { // Enforce that we are not converting a non-reference type T to a reference // type U. GTEST_COMPILE_ASSERT_( - internal::is_reference<T>::value || !internal::is_reference<U>::value, + std::is_reference<T>::value || !std::is_reference<U>::value, cannot_convert_non_reference_arg_to_reference); // In case both T and U are arithmetic types, enforce that the // conversion is not lossy. |