Googletest export

.travis.yml

@@ -66,7 +66,7 @@ addons:
     packages:
     - ccache
     - gcc@4.9
-    - llvm@4
+    - llvm@3.9
     update: true
 
 notifications:

googlemock/docs/cook_book.md

@@ -3688,10 +3688,10 @@ class NotNullMatcher {
   }
 
   // Describes the property of a value matching this matcher.
-  void DescribeTo(::std::ostream* os) const { *os << "is not NULL"; }
+  void DescribeTo(std::ostream* os) const { *os << "is not NULL"; }
 
   // Describes the property of a value NOT matching this matcher.
-  void DescribeNegationTo(::std::ostream* os) const { *os << "is NULL"; }
+  void DescribeNegationTo(std::ostream* os) const { *os << "is NULL"; }
 };
 
 // To construct a polymorphic matcher, pass an instance of the class
@@ -3735,7 +3735,7 @@ class CardinalityInterface {
   virtual bool IsSaturatedByCallCount(int call_count) const = 0;
 
   // Describes self to an ostream.
-  virtual void DescribeTo(::std::ostream* os) const = 0;
+  virtual void DescribeTo(std::ostream* os) const = 0;
 };
 ```
 
@@ -3757,7 +3757,7 @@ class EvenNumberCardinality : public CardinalityInterface {
     return false;
   }
 
-  void DescribeTo(::std::ostream* os) const {
+  void DescribeTo(std::ostream* os) const {
     *os << "called even number of times";
   }
 };