aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2020-03-27 09:16:06 +1100
committerNeil <nyamatongwe@gmail.com>2020-03-27 09:16:06 +1100
commit65c3b110e48a73b4bc6fe2cb1f37d2415c0aa3d2 (patch)
treed5d952a94347de3a06692f0c955161256b0e4beb /src
parent5f4a3252dfb66b77f6ed4acf0e4bc46a5c678744 (diff)
downloadscintilla-mirror-65c3b110e48a73b4bc6fe2cb1f37d2415c0aa3d2.tar.gz
Backport: Avoid casts by returning size_t from GetExpanded.
Backport of changeset 8099:2228fb724ce7.
Diffstat (limited to 'src')
-rw-r--r--src/ScintillaBase.cxx4
1 files changed, 2 insertions, 2 deletions
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);
}