Updated to gmock-1.7.0

[alexxy/gromacs.git] / src / external / gmock-1.7.0 / src / gmock-cardinalities.cc

diff --git a/src/external/gmock-1.6.0/src/gmock-cardinalities.cc b/src/external/gmock-1.7.0/src/gmock-cardinalities.cc
similarity index 93%
rename from src/external/gmock-1.6.0/src/gmock-cardinalities.cc
rename to src/external/gmock-1.7.0/src/gmock-cardinalities.cc
index 1a7902b48855e9e1963418f4c703a948bc8bebee..50ec7286eebee5bdc6a62de7141703fbb23ad87b 100644 (file)
--- a/src/external/gmock-1.6.0/src/gmock-cardinalities.cc
+++ b/src/external/gmock-1.7.0/src/gmock-cardinalities.cc
@@ -75,7 +75,7 @@ class BetweenCardinalityImpl : public CardinalityInterface {
   virtual int ConservativeUpperBound() const { return max_; }
 
   virtual bool IsSatisfiedByCallCount(int call_count) const {
-    return min_ <= call_count && call_count <= max_ ;
+    return min_ <= call_count && call_count <= max_;
   }
 
   virtual bool IsSaturatedByCallCount(int call_count) const {
@@ -83,6 +83,7 @@ class BetweenCardinalityImpl : public CardinalityInterface {
   }
 
   virtual void DescribeTo(::std::ostream* os) const;
+
  private:
   const int min_;
   const int max_;
@@ -136,20 +137,20 @@ void Cardinality::DescribeActualCallCountTo(int actual_call_count,
 }
 
 // Creates a cardinality that allows at least n calls.
-Cardinality AtLeast(int n) { return Between(n, INT_MAX); }
+GTEST_API_ Cardinality AtLeast(int n) { return Between(n, INT_MAX); }
 
 // Creates a cardinality that allows at most n calls.
-Cardinality AtMost(int n) { return Between(0, n); }
+GTEST_API_ Cardinality AtMost(int n) { return Between(0, n); }
 
 // Creates a cardinality that allows any number of calls.
-Cardinality AnyNumber() { return AtLeast(0); }
+GTEST_API_ Cardinality AnyNumber() { return AtLeast(0); }
 
 // Creates a cardinality that allows between min and max calls.
-Cardinality Between(int min, int max) {
+GTEST_API_ Cardinality Between(int min, int max) {
   return Cardinality(new BetweenCardinalityImpl(min, max));
 }
 
 // Creates a cardinality that allows exactly n calls.
-Cardinality Exactly(int n) { return Between(n, n); }
+GTEST_API_ Cardinality Exactly(int n) { return Between(n, n); }
 
 }  // namespace testing