commit d9c55a48eddbc92434454ac2b28771870750e616
author Gennadiy Civil <misterg@google.com> Tue Aug 27 21:30:41 2019 -0400
committer Gennadiy Civil <misterg@google.com> Tue Aug 27 21:30:42 2019 -0400
tree 79ea5055f5aca01d5b8b1bb82d6986c7b2b80931
parent fdd6a1dc8c74bf37211c14a1b2e4b64755bb3380
parent 38ce18e8e6621433963bd118ed2d36a791efe8e7

Merge pull request #2426 from kuzkry:#2396-postreview

PiperOrigin-RevId: 265785837

googlemock/include/gmock/gmock-matchers.h

diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index b1c0dc0..fa50903 100644
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -133,14 +133,14 @@
     // a user-defined conversion from M to T if one exists (assuming M is
     // a value).
     return CastImpl(polymorphic_matcher_or_value,
-                    bool_constant<std::is_convertible<M, Matcher<T>>::value>(),
-                    bool_constant<std::is_convertible<M, T>::value>());
+                    std::is_convertible<M, Matcher<T>>{},
+                    std::is_convertible<M, T>{});
   }
 
  private:
   template <bool Ignore>
   static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value,
-                             bool_constant<true> /* convertible_to_matcher */,
+                             std::true_type /* convertible_to_matcher */,
                              bool_constant<Ignore>) {
     // M is implicitly convertible to Matcher<T>, which means that either
     // M is a polymorphic matcher or Matcher<T> has an implicit constructor
@@ -157,8 +157,8 @@
   // matcher. It's a value of a type implicitly convertible to T. Use direct
   // initialization to create a matcher.
   static Matcher<T> CastImpl(const M& value,
-                             bool_constant<false> /* convertible_to_matcher */,
-                             bool_constant<true> /* convertible_to_T */) {
+                             std::false_type /* convertible_to_matcher */,
+                             std::true_type /* convertible_to_T */) {
     return Matcher<T>(ImplicitCast_<T>(value));
   }
 
@@ -173,8 +173,8 @@
   //
   // We don't define this method inline as we need the declaration of Eq().
   static Matcher<T> CastImpl(const M& value,
-                             bool_constant<false> /* convertible_to_matcher */,
-                             bool_constant<false> /* convertible_to_T */);
+                             std::false_type /* convertible_to_matcher */,
+                             std::false_type /* convertible_to_T */);
 };
 
 // This more specialized version is used when MatcherCast()'s argument
@@ -3600,8 +3600,8 @@
 
 template <typename T, typename M>
 Matcher<T> internal::MatcherCastImpl<T, M>::CastImpl(
-    const M& value, internal::bool_constant<false> /* convertible_to_matcher */,
-    internal::bool_constant<false> /* convertible_to_T */) {
+    const M& value, std::false_type /* convertible_to_matcher */,
+    std::false_type /* convertible_to_T */) {
   return Eq(value);
 }