diff options
| author | mitchell <unknown> | 2020-01-06 20:20:56 -0500 |
|---|---|---|
| committer | mitchell <unknown> | 2020-01-06 20:20:56 -0500 |
| commit | f6e6731598a02121be850a17a12384090b40f1ac (patch) | |
| tree | 5df339d665458d5e6878c292b8e79055951fef4d /src | |
| parent | a7b57f9b5bb481c9b5b98dda13c0e9c44d26a237 (diff) | |
| download | scintilla-mirror-f6e6731598a02121be850a17a12384090b40f1ac.tar.gz | |
More synchronizing LongTerm3 with default.
Ideally this covers anything missed during the backport process.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CaseConvert.cxx | 3 | ||||
| -rw-r--r-- | src/Position.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx index dd8a25aa1..9ecf3e2e8 100644 --- a/src/CaseConvert.cxx +++ b/src/CaseConvert.cxx @@ -581,6 +581,9 @@ class CaseConverter : public ICaseConverter { struct CharacterConversion { int character; ConversionString conversion; + CharacterConversion() noexcept : character(0) { + // Empty case: NUL -> "". + } CharacterConversion(int character_=0, const char *conversion_="") noexcept : character(character_) { StringCopy(conversion.conversion, conversion_); } diff --git a/src/Position.h b/src/Position.h index ab8223b54..e0bbcb53f 100644 --- a/src/Position.h +++ b/src/Position.h @@ -21,11 +21,6 @@ typedef ptrdiff_t Line; const Position invalidPosition = -1; -template <typename T> -inline constexpr T clamp(T val, T minVal, T maxVal) { - return (val > maxVal) ? maxVal : ((val < minVal) ? minVal : val); -} - } #endif |