amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

compatibility with wxWdigets 2.9+: use wxString::const_iterator instead of raw Char*

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1528 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-12-07 21:04:11 +00:00
parent 3562891b42
commit 65cde6c8f3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/regex.hpp
+4 -4
View File
@@ -38,7 +38,7 @@
*/ */
class Regex { class Regex {
public: public:
struct Results : public boost::match_results<const Char*> { struct Results : public boost::match_results<String::const_iterator> {
/// Get a sub match /// Get a sub match
inline String str(int sub = 0) const { inline String str(int sub = 0) const {
const_reference v = (*this)[sub]; const_reference v = (*this)[sub];
@@ -48,7 +48,7 @@
inline String format(const String& format) const { inline String format(const String& format) const {
std::basic_string<Char> fmt(format.begin(),format.end()); std::basic_string<Char> fmt(format.begin(),format.end());
String output; String output;
boost::match_results<const Char*>::format( boost::match_results<String::const_iterator>::format(
insert_iterator<String>(output, output.end()), fmt, boost::format_sed); insert_iterator<String>(output, output.end()), fmt, boost::format_sed);
return output; return output;
} }
@@ -62,9 +62,9 @@
return regex_search(str.begin(), str.end(), regex); return regex_search(str.begin(), str.end(), regex);
} }
inline bool matches(Results& results, const String& str) const { inline bool matches(Results& results, const String& str) const {
return regex_search(str.begin(), str.end(), results, regex); return matches(results, str.begin(), str.end());
} }
inline bool matches(Results& results, const Char* begin, const Char* end) const { inline bool matches(Results& results, const String::const_iterator& begin, const String::const_iterator& end) const {
return regex_search(begin, end, results, regex); return regex_search(begin, end, results, regex);
} }
void replace_all(String* input, const String& format); void replace_all(String* input, const String& format);