diff options
author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-12-01 19:42:25 +0000 |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-12-01 19:42:25 +0000 |
commit | f6d6a22b8eea931b49a8c33de3092d4623ed0d41 (patch) | |
tree | a0608d2270992b90160a57c68014fb65ade117df /src | |
parent | 19eb9e9e3d4d5a4f0eee786d7664ca0e45137390 (diff) | |
download | googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.tar.gz googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.tar.bz2 googletest-f6d6a22b8eea931b49a8c33de3092d4623ed0d41.zip |
Fixes Cygwin compatibility (by Vlad Losev); Improves Python tests (by Vlad Losev); Fixes ambiguous call to implicit_cast; Uses gtest's SkipPrefix() instead gmock's own (by Vlad Losev).
Diffstat (limited to 'src')
-rw-r--r-- | src/gmock-matchers.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/gmock-matchers.cc b/src/gmock-matchers.cc index 79b525d3..0abca708 100644 --- a/src/gmock-matchers.cc +++ b/src/gmock-matchers.cc @@ -83,18 +83,6 @@ int GetParamIndex(const char* param_names[], const string& param_name) { return kInvalidInterpolation; } -// If *pstr starts with the given prefix, modifies *pstr to be right -// past the prefix and returns true; otherwise leaves *pstr unchanged -// and returns false. None of pstr, *pstr, and prefix can be NULL. -bool SkipPrefix(const char* prefix, const char** pstr) { - const size_t prefix_len = strlen(prefix); - if (strncmp(*pstr, prefix, prefix_len) == 0) { - *pstr += prefix_len; - return true; - } - return false; -} - // Helper function used by ValidateMatcherDescription() to format // error messages. string FormatMatcherDescriptionSyntaxError(const char* description, |