diff options
| author | Abseil Team <absl-team@google.com> | 2019-10-21 10:56:09 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-10-22 09:38:12 -0400 |
| commit | 611a321a6e641846497f75375f9cbe7825ff3f23 (patch) | |
| tree | 19772533815c9132759f5b527d023eb30b997246 /googlemock/include/gmock/gmock-matchers.h | |
| parent | a5216dd1a9f392ad1084a4944f87ff48c82ee3d2 (diff) | |
| download | googletest-611a321a6e641846497f75375f9cbe7825ff3f23.tar.gz googletest-611a321a6e641846497f75375f9cbe7825ff3f23.tar.bz2 googletest-611a321a6e641846497f75375f9cbe7825ff3f23.zip | |
Googletest export
Remove bool_constant in favor of std::integral_constant<bool, ...>;
The one non-trivial use of bool_constant has been changed to have significantly
fewer template specializations.
PiperOrigin-RevId: 275842490
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 be446aad..bb047da9 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -142,7 +142,7 @@ class MatcherCastImpl { template <bool Ignore> static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value, std::true_type /* convertible_to_matcher */, - bool_constant<Ignore>) { + std::integral_constant<bool, Ignore>) { // M is implicitly convertible to Matcher<T>, which means that either // M is a polymorphic matcher or Matcher<T> has an implicit constructor // from M. In both cases using the implicit conversion will produce a |