diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 21:43:25 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-29 21:43:25 +0000 |
| commit | 145a7ca423cf3a3249ca0329be37dc447f9ce855 (patch) | |
| tree | cdf1ca18db5e088b671cbdeda33635726d32a1ad /testing/gmock/src/gmock-matchers.cc | |
| parent | 02ae88443795ca043b15083898e83ad2811b032b (diff) | |
| download | chromium_src-145a7ca423cf3a3249ca0329be37dc447f9ce855.zip chromium_src-145a7ca423cf3a3249ca0329be37dc447f9ce855.tar.gz chromium_src-145a7ca423cf3a3249ca0329be37dc447f9ce855.tar.bz2 | |
Update gmock and gtest.
(Hoping to pick up a clang-related bug fix.)
Review URL: http://codereview.chromium.org/521012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gmock/src/gmock-matchers.cc')
| -rw-r--r-- | testing/gmock/src/gmock-matchers.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/testing/gmock/src/gmock-matchers.cc b/testing/gmock/src/gmock-matchers.cc index 79b525d..0abca70 100644 --- a/testing/gmock/src/gmock-matchers.cc +++ b/testing/gmock/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, |