Use noexcept in CaseConvert as well as std::string_view::copy.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx
index d9d01b103..a3092b320 100644
--- a/src/CaseConvert.cxx
+++ b/src/CaseConvert.cxx
@@ -570,7 +570,7 @@ class CaseConverter : public ICaseConverter {
 	enum { maxConversionLength=6 };
 	struct ConversionString {
 		char conversion[maxConversionLength+1];
-		ConversionString() : conversion{} {
+		ConversionString() noexcept : conversion{} {
 		}
 	};
 	// Conversions are initially store in a vector of structs but then decomposed into
@@ -583,7 +583,7 @@ class CaseConverter : public ICaseConverter {
 		}
 		CharacterConversion(int character_, std::string_view conversion_) noexcept : character(character_) {
 			assert(conversion_.length() <= maxConversionLength);
-			std::copy(std::begin(conversion_), std::end(conversion_), conversion.conversion);
+			conversion_.copy(conversion.conversion, conversion_.length());
 		}
 		bool operator<(const CharacterConversion &other) const noexcept {
 			return character < other.character;
@@ -596,10 +596,10 @@ class CaseConverter : public ICaseConverter {
 	std::vector<ConversionString> conversions;
 
 public:
-	CaseConverter() {
+	CaseConverter() noexcept {
 	}
 	virtual ~CaseConverter() = default;
-	bool Initialised() const {
+	bool Initialised() const noexcept {
 		return !characters.empty();
 	}
 	void Add(int character, const char *conversion) {
@@ -776,7 +776,7 @@ void SetupConversions(enum CaseConversion conversion) {
 	}
 }
 
-CaseConverter *ConverterForConversion(enum CaseConversion conversion) {
+CaseConverter *ConverterForConversion(enum CaseConversion conversion) noexcept {
 	switch (conversion) {
 	case CaseConversionFold:
 		return &caseConvFold;