# # # patch "pcrewrap.cc" # from [94423da42533e2032bac9b759a8ef34a483b8c83] # to [1d8add0693c92691f9d69afc8cf3c6254ab7c8ae] # # patch "pcrewrap.hh" # from [007bcae3d6a968650f662857cf008102d5249944] # to [88a5febaa51ead63372be8464b5e9c463b1fa653] # ============================================================ --- pcrewrap.cc 94423da42533e2032bac9b759a8ef34a483b8c83 +++ pcrewrap.cc 1d8add0693c92691f9d69afc8cf3c6254ab7c8ae @@ -112,17 +112,11 @@ namespace pcre } bool - regex::match(string const & subject, - string::const_iterator startptr, - flags options) const + regex::match(string const & subject, flags options) const { - int startoffset = 0; - if (startptr != string::const_iterator((char *)0)) - startoffset = &*startptr - &*subject.data(); - int rc = pcre_exec(basedat, extradat, subject.data(), subject.size(), - startoffset, flags_to_internal(options), 0, 0); + 0, flags_to_internal(options), 0, 0); if (rc == 0) return true; else if (rc == PCRE_ERROR_NOMATCH) ============================================================ --- pcrewrap.hh 007bcae3d6a968650f662857cf008102d5249944 +++ pcrewrap.hh 88a5febaa51ead63372be8464b5e9c463b1fa653 @@ -70,8 +70,6 @@ namespace pcre ~regex(); bool match(std::string const & subject, - std::string::const_iterator startoffset - = std::string::const_iterator(), pcre::flags options = DEFAULT) const; }; } // namespace pcre