Fixes for clang-17

More tests for magic_enum

Author: florianbecker

cmake/clang_warnings.cmake

@@ -47,7 +47,7 @@ set(WARNING_FLAGS_VERSION16
   -Wno-unsafe-buffer-usage
 )
 
-set(WARNING_FLAGS_VERSION18
+set(WARNING_FLAGS_VERSION17
 
   # Own parameter
   -Wno-switch-default
@@ -63,8 +63,8 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16)
   endforeach()
 endif()
 
-if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18 AND NOT CMAKE_CXX_COMPILER_ID MATCHES AppleClang)
-  foreach(WARNING_FLAG ${WARNING_FLAGS_VERSION18})
+if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17)
+  foreach(WARNING_FLAG ${WARNING_FLAGS_VERSION17})
     set(WARNING_FLAGS_SPACED "${WARNING_FLAGS_SPACED} ${WARNING_FLAG}")
   endforeach()
 endif()

source/Demangle.cpp

@@ -69,7 +69,7 @@ namespace vx::demangle {
     const std::unique_ptr<char, void ( * )( char * )> res {
 
       abi::__cxa_demangle( _name.c_str(), nullptr, nullptr, &status ),
-      []( char *_toFree ) { std::free( _toFree ); } // NOSONAR raii is nor possible here.
+      []( char *_toFree ) { std::free( _toFree ); } // NOSONAR raii is not possible here.
     };
 
     if ( status == 0 ) {

source/StringUtils.cpp

@@ -215,15 +215,15 @@ namespace vx::string_utils {
     return result;
   }
 
-  std::optional<std::string> fromUnsignedChar( const unsigned char *_uchr ) noexcept {
+  std::optional<std::string> MAYBE_BAD_fromUnsignedChar( const unsigned char *_uchr ) noexcept {
 
     /* nullptr check is mandatory */
     if ( !_uchr ) { return {}; }
 
-    std::basic_string<unsigned char> string {};
+    std::string string {};
     try {
 
-      string = _uchr;
+      string = reinterpret_cast<const char *>( _uchr );
     }
     catch( const std::exception &_exception ) {
 
@@ -244,10 +244,10 @@ namespace vx::string_utils {
 #if defined __linux__ && defined __clang__ && __clang_major__ >= 18
       size = std::strlen( reinterpret_cast<const char *>( _uchr ) );
 #else
-      std::basic_string<unsigned char> string {};
+      std::string string {};
       try {
 
-        string = _uchr;
+        string = reinterpret_cast<const char *>( _uchr );
       }
       catch( const std::exception &_exception ) {
 

source/StringUtils.h

@@ -146,7 +146,7 @@ namespace vx::string_utils {
    * @return Standard string from unsigned char.
    * @note This function may throw an exception by the constructor of std::string.
    */
-  [[nodiscard]] std::optional<std::string> fromUnsignedChar( const unsigned char *_uchr ) noexcept;
+  [[nodiscard]] std::optional<std::string> MAYBE_BAD_fromUnsignedChar( const unsigned char *_uchr ) noexcept;
 
   /**
    * @brief Returns standard string from unsigned char.

tests/test_magic_enum.cpp

@@ -338,6 +338,60 @@ namespace vx {
     EXPECT_TRUE( std::is_scoped_enum_v<Color> );
     EXPECT_FALSE( std::is_scoped_enum_v<int> );
   }
+
+  TEST( MagicEnum, Extend ) {
+
+    enum class QNetworkReply {
+
+      ConnectionRefusedError = 1,
+      RemoteHostClosedError = 2,
+      HostNotFoundError = 3,
+      TimeoutError = 4,
+      OperationCanceledError = 5,
+      SslHandshakeFailedError = 6,
+      TemporaryNetworkFailureError = 7,
+      NetworkSessionFailedError = 8,
+      BackgroundRequestNotAllowedError = 9,
+      TooManyRedirectsError = 10,
+      InsecureRedirectError = 11,
+      ProxyConnectionRefusedError = 101,
+      ProxyConnectionClosedError = 102,
+      ProxyNotFoundError = 103,
+      ProxyTimeoutError = 104,
+      ProxyAuthenticationRequiredError = 105,
+      ContentAccessDenied = 201,
+      ContentOperationNotPermittedError = 202,
+      ContentNotFoundError = 203,
+      AuthenticationRequiredError = 204,
+      ContentReSendError = 205,
+      ContentConflictError = 206,
+      ContentGoneError = 207,
+      InternalServerError = 401,
+      OperationNotImplementedError = 402,
+      ServiceUnavailableError = 403,
+      ProtocolUnknownError = 301,
+      ProtocolInvalidOperationError = 302,
+      UnknownNetworkError = 99,
+      UnknownProxyError = 199,
+      UnknownContentError = 299,
+      ProtocolFailure = 399,
+      UnknownServerError = 499
+    };
+
+    const std::optional seven = magic_enum::enum_cast<QNetworkReply>( 7 );
+    EXPECT_TRUE( seven.has_value() );
+
+    /* Default maximum value of magic_enum is 128 - so this test is fale, without configuration */
+    const std::optional threeZeroOne = magic_enum::enum_cast<QNetworkReply>( 301 );
+    EXPECT_FALSE( threeZeroOne.has_value() );
+
+    const std::optional threeOneEight = magic_enum::enum_cast<QNetworkReply>( 318 );
+    EXPECT_FALSE( threeOneEight.has_value() );
+
+    /* Magic_enum gives the name, but cannot handle the id */
+    constexpr auto unkownServerError = magic_enum::enum_name<QNetworkReply::UnknownServerError>();
+    EXPECT_EQ( unkownServerError, "UnknownServerError" );
+  }
 }
 #ifdef __clang__
   #pragma clang diagnostic pop

tests/test_string_utils.cpp

@@ -180,15 +180,15 @@ namespace vx {
 
     unsigned char chrArray[] = "The answer is 42."; // NOSONAR just for testing purpose.
     const unsigned char *chrPointer = chrArray;
-    EXPECT_EQ( string_utils::fromUnsignedChar( chrPointer ), "The answer is 42." );
+    EXPECT_EQ( string_utils::MAYBE_BAD_fromUnsignedChar( chrPointer ), "The answer is 42." );
     EXPECT_EQ( string_utils::MAYBE_BAD_fromUnsignedChar( chrPointer, 0 ), "The answer is 42." );
     EXPECT_EQ( string_utils::MAYBE_BAD_fromUnsignedChar( chrPointer, 17 ), "The answer is 42." );
     EXPECT_EQ( string_utils::MAYBE_BAD_fromUnsignedChar( chrPointer, 10 ), "The answer" );
     EXPECT_NE( string_utils::MAYBE_BAD_fromUnsignedChar( chrPointer, 5 ), "The answer is 42." );
 
     /* nullptr unsigned char */
     const unsigned char *chrPointerNull = nullptr;
-    EXPECT_EQ( string_utils::fromUnsignedChar( chrPointerNull ), std::nullopt );
+    EXPECT_EQ( string_utils::MAYBE_BAD_fromUnsignedChar( chrPointerNull ), std::nullopt );
     EXPECT_EQ( string_utils::MAYBE_BAD_fromUnsignedChar( chrPointerNull, 0 ), std::nullopt );
 
     /* Wrong size check - more than expected. */