summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-12-04 10:54:07 +0100
committerGitHub <noreply@github.com>2018-12-04 10:54:07 +0100
commit83a5c808ab3567a4267c10040092f0358e064969 (patch)
tree8dd13b8a2bdbc35287f8bc884f01efef81199e79
parent6f9aa8727c8905fbc0c10ea8d214c7d31f01f467 (diff)
parenta758653199001ffb613e5b6d15d4a50920292fe3 (diff)
Merge pull request #24143 from ibrahn/make-ustring-op-const
const char* operator on CharString now const.
-rw-r--r--core/ustring.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/ustring.h b/core/ustring.h
index d2766ec7a3..8e4dbd8031 100644
--- a/core/ustring.h
+++ b/core/ustring.h
@@ -63,7 +63,7 @@ public:
CharString &operator+=(char p_char);
int length() const { return size() ? size() - 1 : 0; }
const char *get_data() const;
- operator const char *() { return get_data(); };
+ operator const char *() const { return get_data(); };
};
typedef wchar_t CharType;