Backport: Avoid casts by returning size_t from GetExpanded.

Backport of changeset 8099:2228fb724ce7.

3 files changed, 5 insertions, 5 deletions

diff --git a/lexlib/PropSetSimple.cxx b/lexlib/PropSetSimple.cxx
index 5ce353c71..6e1312527 100644
--- a/lexlib/PropSetSimple.cxx
+++ b/lexlib/PropSetSimple.cxx
@@ -137,10 +137,10 @@ static int ExpandAllInPlace(const PropSetSimple &props, std::string &withVars, i
 	return maxExpands;
 }
 
-int PropSetSimple::GetExpanded(const char *key, char *result) const {
+size_t PropSetSimple::GetExpanded(const char *key, char *result) const {
 	std::string val = Get(key);
 	ExpandAllInPlace(*this, val, 100, VarChain(key));
-	const int n = static_cast<int>(val.size());
+	const size_t n = val.size();
 	if (result) {
 		memcpy(result, val.c_str(), n+1);
 	}
diff --git a/lexlib/PropSetSimple.h b/lexlib/PropSetSimple.h
index ba4e42446..d4a5b2243 100644
--- a/lexlib/PropSetSimple.h
+++ b/lexlib/PropSetSimple.h
@@ -19,7 +19,7 @@ public:
 	void Set(const char *key, const char *val, size_t lenKey, size_t lenVal);
 	void SetMultiple(const char *);
 	const char *Get(const char *key) const;
-	int GetExpanded(const char *key, char *result) const;
+	size_t GetExpanded(const char *key, char *result) const;
 	int GetInt(const char *key, int defaultValue=0) const;
 };
 
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);
 }