From 65c3b110e48a73b4bc6fe2cb1f37d2415c0aa3d2 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 27 Mar 2020 09:16:06 +1100 Subject: Backport: Avoid casts by returning size_t from GetExpanded. Backport of changeset 8099:2228fb724ce7. --- src/ScintillaBase.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index ca67d7475..0975028f3 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -579,7 +579,7 @@ public: void PropSet(const char *key, const char *val); const char *PropGet(const char *key) const; int PropGetInt(const char *key, int defaultValue=0) const; - int PropGetExpanded(const char *key, char *result) const; + size_t PropGetExpanded(const char *key, char *result) const; int LineEndTypesSupported() override; int AllocateSubStyles(int styleBase, int numberStyles); @@ -736,7 +736,7 @@ int LexState::PropGetInt(const char *key, int defaultValue) const { return props.GetInt(key, defaultValue); } -int LexState::PropGetExpanded(const char *key, char *result) const { +size_t LexState::PropGetExpanded(const char *key, char *result) const { return props.GetExpanded(key, result); } -- cgit v1.2.3