Skip to content

Commit b7903ab

Browse files
committed
Upgrade external dependency magic_enum to 0.8.2
1 parent 04e6ff1 commit b7903ab

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

cmake/fetch/magic_enum.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ include(FetchContent)
3232

3333
FetchContent_Declare(magic_enum
3434
GIT_REPOSITORY https://github.com/Neargye/magic_enum.git
35-
GIT_TAG v0.8.1
35+
GIT_TAG v0.8.2
3636
GIT_SHALLOW 1
3737
)
3838

source/Logger_enum.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ namespace vx::logger {
5353

5454
if constexpr ( magic_enum::detail::supported<D>::value ) {
5555

56-
#if MAGIC_ENUM_VERSION_MAJOR >= 0 && MAGIC_ENUM_VERSION_MINOR >= 8 && MAGIC_ENUM_VERSION_PATCH <= 1
57-
if ( const auto name = magic_enum::enum_flags_name<D>( _value ); !name.empty() ) {
58-
#else
5956
if ( const auto name = magic_enum::enum_name<D, magic_enum::as_flags<magic_enum::detail::is_flags_v<D>>>( _value ); !name.empty() ) {
60-
#endif
6157

6258
_logger.stream() << name;
6359
return _logger.maybeSpace();

tests/test_magic_enum.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,7 @@ namespace vx {
127127
/* Bad case */
128128
/* any value */
129129
const std::optional colorUnkown = magic_enum::enum_cast<Color>( 7 );
130-
/* BUG: https://github.com/Neargye/magic_enum/issues/216 */
131-
#if MAGIC_ENUM_VERSION_MAJOR >= 0 && MAGIC_ENUM_VERSION_MINOR >= 8 && MAGIC_ENUM_VERSION_PATCH <= 1
132-
EXPECT_TRUE( colorUnkown.has_value() );
133-
#else
134130
EXPECT_FALSE( colorUnkown.has_value() );
135-
#endif
136131

137132
constexpr auto colors = magic_enum::enum_values<Color>();
138133

@@ -144,12 +139,7 @@ namespace vx {
144139
EXPECT_EQ( max, 14 );
145140

146141
const std::optional colorMax = magic_enum::enum_cast<Color>( max );
147-
/* BUG: https://github.com/Neargye/magic_enum/issues/216 */
148-
#if MAGIC_ENUM_VERSION_MAJOR >= 0 && MAGIC_ENUM_VERSION_MINOR >= 8 && MAGIC_ENUM_VERSION_PATCH <= 1
149-
EXPECT_TRUE( colorMax.has_value() );
150-
#else
151142
EXPECT_FALSE( colorMax.has_value() );
152-
#endif
153143

154144
const std::optional colorMaxPlusOne = magic_enum::enum_cast<Color>( max + 1 );
155145
EXPECT_FALSE( colorMaxPlusOne.has_value() );

0 commit comments

Comments
 (0)