X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/591d01bebacf365a654a9061cddeb7fae617a2f5..fc1e45d95b99c7939c61daa1853567c0bbe6aeca:/src/stc/scintilla/include/SString.h

diff --git a/src/stc/scintilla/include/SString.h b/src/stc/scintilla/include/SString.h
index 5c2a93d33b..b770afebee 100644
--- a/src/stc/scintilla/include/SString.h
+++ b/src/stc/scintilla/include/SString.h
@@ -8,11 +8,16 @@
 #ifndef SSTRING_H
 #define SSTRING_H
 
+
 // These functions are implemented because each platform calls them something different.
 int CompareCaseInsensitive(const char *a, const char *b);
 int CompareNCaseInsensitive(const char *a, const char *b, size_t len);
 bool EqualCaseInsensitive(const char *a, const char *b);
 
+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+
 // Define another string class.
 // While it would be 'better' to use std::string, that doubles the executable size.
 // An SString may contain embedded nul characters.
@@ -197,7 +202,7 @@ public:
 	bool operator!=(const char *sOther) const {
 		return !operator==(sOther);
 	}
-	bool contains(char ch) {
+	bool contains(char ch) const {
 		return (s && *s) ? strchr(s, ch) != 0 : false;
 	}
 	void setsizegrowth(lenpos_t sizeGrowth_) {
@@ -253,7 +258,7 @@ public:
 	bool startswith(const char *prefix);
 	bool endswith(const char *suffix);
 	int search(const char *sFind, lenpos_t start=0) const;
-	bool contains(const char *sFind) {
+	bool contains(const char *sFind) const {
 		return search(sFind) >= 0;
 	}
 	int substitute(char chFind, char chReplace);
@@ -277,4 +282,8 @@ inline char *StringDup(
 	return SContainer::StringAllocate(s, len);
 }
 
+#ifdef SCI_NAMESPACE
+}
+#endif
+
 #endif