Merge pull request #821 from mazong1123/master

Fixed issue #775. Mark the ConvertibleFromAny constructor as explicit, and fix operator overload issue for Unprintable

Merge pull request #821 from mazong1123/master
ec44c6c1 · Billy Donahue · GitHub · d406cb18 · dc2dbf1f · ec44c6c1
Commit ec44c6c1 authored Jul 14, 2016 by Billy Donahue Committed by GitHub Jul 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

gmock-matchers_test.cc googlemock/test/gmock-matchers_test.cc +6 -2

No files found.
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@ -613,7 +613,7 @@ TEST(MatcherCastTest, FromSameType) {
 struct ConvertibleFromAny {
  ConvertibleFromAny(int a_value) : value(a_value) {}
  template <typename T>
-  ConvertibleFromAny(const T& /*a_value*/) : value(-1) {
+  explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) {
    ADD_FAILURE() << "Conversion constructor called";
  }
  int value;
@@ -867,11 +867,15 @@ class Unprintable {
 public:
  Unprintable() : c_('a') {}

-  bool operator==(const Unprintable& /* rhs */) { return true; }
 private:
  char c_;
 };

+inline bool operator==(const Unprintable& /* lhs */, 
+                       const Unprintable& /* rhs */) { 
+    return true; 
+}
+
 TEST(EqTest, CanDescribeSelf) {
  Matcher<Unprintable> m = Eq(Unprintable());
  EXPECT_EQ("is equal to 1-byte object <61>", Describe(m));