From f6e6731598a02121be850a17a12384090b40f1ac Mon Sep 17 00:00:00 2001
From: mitchell <unknown>
Date: Mon, 6 Jan 2020 20:20:56 -0500
Subject: More synchronizing LongTerm3 with default. Ideally this covers
 anything missed during the backport process.

---
 src/CaseConvert.cxx | 3 +++
 src/Position.h      | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3