From 79a367eb217fcd47e2beaf8c0f87fe6d5926f739 Mon Sep 17 00:00:00 2001 From: jgm Date: Tue, 10 Apr 2012 16:02:11 +0000 Subject: Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes. --- src/gmock-cardinalities.cc | 3 ++- src/gmock-spec-builders.cc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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_; diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc index 6599325d..a93ea71a 100644 --- a/src/gmock-spec-builders.cc +++ b/src/gmock-spec-builders.cc @@ -579,6 +579,7 @@ class MockObjectRegistry { } StateMap& states() { return states_; } + private: StateMap states_; }; -- cgit v1.2.3