diff options
author | jgm <jgm@google.com> | 2012-04-10 16:02:11 +0000 |
---|---|---|
committer | jgm <jgm@google.com> | 2012-04-10 16:02:11 +0000 |
commit | 79a367eb217fcd47e2beaf8c0f87fe6d5926f739 (patch) | |
tree | 148e73f4c3b6354f900cae94be5e9495e04d7efa /src/gmock-cardinalities.cc | |
parent | 9bcb5f9146db42bc38b6bb744fb0cf518a0205be (diff) | |
download | googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.gz googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.bz2 googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.zip |
Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes.
Diffstat (limited to 'src/gmock-cardinalities.cc')
-rw-r--r-- | src/gmock-cardinalities.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gmock-cardinalities.cc b/src/gmock-cardinalities.cc index 274f98a9..50ec7286 100644 --- a/src/gmock-cardinalities.cc +++ b/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_; |