gmock-matchers.cc (googletest-release-1.10.0) | : | gmock-matchers.cc (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
// Google Mock - a framework for writing C++ mock classes. | // Google Mock - a framework for writing C++ mock classes. | |||
// | // | |||
// This file implements Matcher<const string&>, Matcher<string>, and | // This file implements Matcher<const string&>, Matcher<string>, and | |||
// utilities for defining matchers. | // utilities for defining matchers. | |||
#include "gmock/gmock-matchers.h" | #include "gmock/gmock-matchers.h" | |||
#include "gmock/gmock-generated-matchers.h" | ||||
#include <string.h> | #include <string.h> | |||
#include <iostream> | #include <iostream> | |||
#include <sstream> | #include <sstream> | |||
#include <string> | #include <string> | |||
namespace testing { | namespace testing { | |||
namespace internal { | namespace internal { | |||
// Returns the description for a matcher defined using the MATCHER*() | // Returns the description for a matcher defined using the MATCHER*() | |||
skipping to change at line 221 | skipping to change at line 220 | |||
// outflow from that node to a node on the right_ side. The values | // outflow from that node to a node on the right_ side. The values | |||
// in the right_ indicate inflow, and specify which left_ node is | // in the right_ indicate inflow, and specify which left_ node is | |||
// feeding that right_ node, if any. For example, left_[3] == 1 means | // feeding that right_ node, if any. For example, left_[3] == 1 means | |||
// there's a flow from element #3 to matcher #1. Such a flow would also | // there's a flow from element #3 to matcher #1. Such a flow would also | |||
// be redundantly represented in the right_ vector as right_[1] == 3. | // be redundantly represented in the right_ vector as right_[1] == 3. | |||
// Elements of left_ and right_ are either kUnused or mutually | // Elements of left_ and right_ are either kUnused or mutually | |||
// referent. Mutually referent means that left_[right_[i]] = i and | // referent. Mutually referent means that left_[right_[i]] = i and | |||
// right_[left_[i]] = i. | // right_[left_[i]] = i. | |||
::std::vector<size_t> left_; | ::std::vector<size_t> left_; | |||
::std::vector<size_t> right_; | ::std::vector<size_t> right_; | |||
GTEST_DISALLOW_ASSIGN_(MaxBipartiteMatchState); | ||||
}; | }; | |||
const size_t MaxBipartiteMatchState::kUnused; | const size_t MaxBipartiteMatchState::kUnused; | |||
GTEST_API_ ElementMatcherPairs FindMaxBipartiteMatching(const MatchMatrix& g) { | GTEST_API_ ElementMatcherPairs FindMaxBipartiteMatching(const MatchMatrix& g) { | |||
return MaxBipartiteMatchState(g).Compute(); | return MaxBipartiteMatchState(g).Compute(); | |||
} | } | |||
static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs, | static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs, | |||
::std::ostream* stream) { | ::std::ostream* stream) { | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 0 lines changed or added |