From ec0e53dc6711aeb827eccd65b6f0779aa841aad2 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 2 Jan 2024 10:08:16 +1100 Subject: Fix warnings in test case code mostly by adding const. --- test/unit/testCharClassify.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/unit/testCharClassify.cxx') diff --git a/test/unit/testCharClassify.cxx b/test/unit/testCharClassify.cxx index 8a9279848..5401b4ec6 100644 --- a/test/unit/testCharClassify.cxx +++ b/test/unit/testCharClassify.cxx @@ -42,7 +42,7 @@ protected: std::unique_ptr pcc; CharacterClass charClass[256]; - static const char* GetClassName(CharacterClass charClass) { + static const char* GetClassName(CharacterClass charClass) noexcept { switch(charClass) { #define CASE(c) case CharacterClass::c: return #c CASE(space); @@ -70,7 +70,7 @@ TEST_CASE_METHOD(CharClassifyTest, "Defaults") { TEST_CASE_METHOD(CharClassifyTest, "Custom") { unsigned char buf[2] = {0, 0}; for (int i = 0; i < 256; i++) { - CharacterClass thisClass = CharacterClass(i % 4); + const CharacterClass thisClass = static_cast(i % 4); buf[0] = i; pcc->SetCharClasses(buf, thisClass); charClass[i] = thisClass; @@ -88,16 +88,16 @@ TEST_CASE_METHOD(CharClassifyTest, "Custom") { TEST_CASE_METHOD(CharClassifyTest, "CharsOfClass") { unsigned char buf[2] = {0, 0}; for (int i = 1; i < 256; i++) { - CharacterClass thisClass = CharacterClass(i % 4); + const CharacterClass thisClass = static_cast(i % 4); buf[0] = i; pcc->SetCharClasses(buf, thisClass); charClass[i] = thisClass; } for (int classVal = 0; classVal < 4; ++classVal) { - CharacterClass thisClass = CharacterClass(classVal % 4); - int size = pcc->GetCharsOfClass(thisClass, NULL); + const CharacterClass thisClass = static_cast(classVal % 4); + const int size = pcc->GetCharsOfClass(thisClass, NULL); std::vector buffer(size+1); - void *pBuffer = static_cast(buffer.data()); + const unsigned char *pBuffer = buffer.data(); pcc->GetCharsOfClass(thisClass, buffer.data()); for (int i = 1; i < 256; i++) { if (charClass[i] == thisClass) { -- cgit v1.2.3