diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-03-27 09:16:06 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-03-27 09:16:06 +1100 |
| commit | 65c3b110e48a73b4bc6fe2cb1f37d2415c0aa3d2 (patch) | |
| tree | d5d952a94347de3a06692f0c955161256b0e4beb /lexlib/PropSetSimple.cxx | |
| parent | 5f4a3252dfb66b77f6ed4acf0e4bc46a5c678744 (diff) | |
| download | scintilla-mirror-65c3b110e48a73b4bc6fe2cb1f37d2415c0aa3d2.tar.gz | |
Backport: Avoid casts by returning size_t from GetExpanded.
Backport of changeset 8099:2228fb724ce7.
Diffstat (limited to 'lexlib/PropSetSimple.cxx')
| -rw-r--r-- | lexlib/PropSetSimple.cxx | 4 |
1 files changed, 2 insertions, 2 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); } |
