From a9a50c358a6471356da80d55c295d1c009825153 Mon Sep 17 00:00:00 2001 From: twanvl Date: Tue, 7 Dec 2010 21:12:44 +0000 Subject: [PATCH] compatibility with wxWdigets 2.9+: wxString::c_str now returns an object instead of a Char*, use cast to force conversion. 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 --- src/util/tagged_string.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/tagged_string.cpp b/src/util/tagged_string.cpp index e7411914..fb8fa4fb 100644 --- a/src/util/tagged_string.cpp +++ b/src/util/tagged_string.cpp @@ -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(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(tag.c_str())+1)) { --taglevel; // close tag } pos = skip_tag(str,pos);