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

compatibility with wxWdigets 2.9+: wxString::c_str now returns an object instead of a Char*, use cast to force conversion.

Browse Source 
TODO: This can probably be done more efficiently!

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1538 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-12-07 21:12:44 +00:00
parent 527d21794c
commit a9a50c358a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/tagged_string.cpp
+2 -2
View File
@@ -155,10 +155,10 @@ size_t in_tag(const String& str, const String& tag, size_t start, size_t end) {
for (size_t pos = 0 ; pos < end ; ) {
Char c = str.GetChar(pos);
if (c == _('<')) {
if (is_substr(str, pos + 1, tag.c_str()+1)) {
if (is_substr(str, pos + 1, static_cast<const Char*>(tag.c_str())+1)) {
if (pos < start) last_start = pos;
++taglevel;
} else if (pos + 2 < size && str.GetChar(pos+1) == _('/') && is_substr(str, pos + 2, tag.c_str()+1)) {
} else if (pos + 2 < size && str.GetChar(pos+1) == _('/') && is_substr(str, pos + 2, static_cast<const Char*>(tag.c_str())+1)) {
--taglevel; // close tag
}
pos = skip_tag(str,pos);