More merge, cleanup
This commit is contained in:
		@@ -113,7 +113,7 @@ class GTEST_API_ Message {
 | 
				
			|||||||
  // Streams a non-pointer value to this object.
 | 
					  // Streams a non-pointer value to this object.
 | 
				
			||||||
  template <typename T>
 | 
					  template <typename T>
 | 
				
			||||||
  inline Message& operator <<(const T& val) {
 | 
					  inline Message& operator <<(const T& val) {
 | 
				
			||||||
    // Some libraries overloads << for STL containers.  These
 | 
					    // Some libraries overload << for STL containers.  These
 | 
				
			||||||
    // overloads are defined in the global namespace instead of ::std.
 | 
					    // overloads are defined in the global namespace instead of ::std.
 | 
				
			||||||
    //
 | 
					    //
 | 
				
			||||||
    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
 | 
					    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user