From fba60a84ae848ce661fefa7e7bb31754fe889b7b Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 9 Mar 2025 10:43:53 +1100 Subject: Avoid warnings by replacing &[0] with .data(), adding [[nodiscard]], replacing typedef with using, and initialising at declaration. --- src/CaseConvert.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/CaseConvert.cxx') diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx index 752fd54e0..560bc8c70 100644 --- a/src/CaseConvert.cxx +++ b/src/CaseConvert.cxx @@ -605,7 +605,7 @@ class CaseConverter final : public ICaseConverter { return character < other.character; } }; - typedef std::vector CharacterToConversion; + using CharacterToConversion = std::vector; CharacterToConversion characterToConversion; // The parallel arrays std::vector characters; @@ -613,7 +613,7 @@ class CaseConverter final : public ICaseConverter { public: CaseConverter() noexcept = default; - bool Initialised() const noexcept { + [[nodiscard]] bool Initialised() const noexcept { return !characters.empty(); } void Add(int character, std::string_view conversion_) { @@ -787,7 +787,7 @@ size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixe std::string CaseConvertString(const std::string &s, CaseConversion conversion) { std::string retMapped(s.length() * maxExpansionCaseConversion, 0); - const size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(), + const size_t lenMapped = CaseConvertString(retMapped.data(), retMapped.length(), s.c_str(), s.length(), conversion); retMapped.resize(lenMapped); return retMapped; -- cgit v1.2.3