Fixed issue #775
This commit is contained in:
		
							parent
							
								
									8397a62185
								
							
						
					
					
						commit
						0b7987a646
					
				@ -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,12 @@ 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));
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user