Skip to content

Updated variant index tag definitions for compatibility with clang #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinmoene merged 1 commit into from
Sep 28, 2025
Merged

Updated variant index tag definitions for compatibility with clang #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/nonstd/variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ struct index_tag_t {};
template< std::size_t K >
inline void index_tag ( index_tag_t<K> = index_tag_t<K>() ) { }

#define variant_index_tag_t(K) void(&)( nonstd::variants::detail::index_tag_t<K> )
#define variant_index_tag(K) nonstd::variants::detail::index_tag<K>
#define variant_index_tag_t(K) nonstd::variants::detail::index_tag_t<K>*
#define variant_index_tag(K) nullptr

} // namespace detail
} // namespace variants
Expand Down
4 changes: 2 additions & 2 deletions template/variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ struct index_tag_t {};
template< std::size_t K >
inline void index_tag ( index_tag_t<K> = index_tag_t<K>() ) { }

#define variant_index_tag_t(K) void(&)( nonstd::variants::detail::index_tag_t<K> )
#define variant_index_tag(K) nonstd::variants::detail::index_tag<K>
#define variant_index_tag_t(K) nonstd::variants::detail::index_tag_t<K>*
#define variant_index_tag(K) nullptr

} // namespace detail
} // namespace variants
Expand Down
2 changes: 2 additions & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ elseif( CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang" )
set( OPTIONS -Wall -Wextra -Wconversion -Wsign-conversion -Wno-missing-braces -fno-elide-constructors )
set( DEFINITIONS ${DEFCMN} )

set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0" )

# GNU: available -std flags depends on version
if( CMAKE_CXX_COMPILER_ID MATCHES "GNU" )
message( STATUS "Matched: GNU")
Expand Down
42 changes: 35 additions & 7 deletions test/variant.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,26 @@ const void * test_nullptr = variant_nullptr;
// Note: variant_BETWEEN() is not be available when std::variant is used:
#define variant_t_BETWEEN( v, lo, hi ) ( (lo) <= (v) && (v) < (hi) )

#ifndef variant_COMPILER_VERSION
# define variant_COMPILER_VERSION( major, minor, patch ) ( 10 * ( 10 * (major) + (minor) ) + (patch) )
#endif

#ifndef variant_COMPILER_CLANG_VERSION
# if defined(__clang__)
# define variant_COMPILER_CLANG_VERSION variant_COMPILER_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
# else
# define variant_COMPILER_CLANG_VERSION 0
# endif
#endif

#ifndef variant_COMPILER_GNUC_VERSION
# if defined(__GNUC__) && !defined(__clang__)
# define variant_COMPILER_GNUC_VERSION variant_COMPILER_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
# else
# define variant_COMPILER_GNUC_VERSION 0
# endif
#endif

// The following tracer code originates as Oracle from Optional by
// Andrzej Krzemienski, https://github.com/akrzemi1/Optional.

Expand Down Expand Up @@ -519,7 +539,13 @@ CASE( "variant: Allows to move-construct from element (C++11)" )

CASE( "variant: Allows to convert-copy-construct from element" )
{
#if !( defined(_MSC_VER) && variant_t_BETWEEN(_MSC_VER, 1920, 1930 ) && variant_USES_STD_VARIANT )
#if ( defined(_MSC_VER) && variant_t_BETWEEN(_MSC_VER, 1920, 1930 ) && variant_USES_STD_VARIANT )
EXPECT( !!"variant: no convert-copy-construct from element with std::variant (VS2019/VC142/1920)" );
#elif ( variant_USES_STD_VARIANT && variant_COMPILER_GNUC_VERSION >= 1010 )
EXPECT( !!"variant: no convert-copy-construct from element with GCC 10.1 or later" );
#elif ( variant_USES_STD_VARIANT && variant_COMPILER_CLANG_VERSION >= 1100 )
EXPECT( !!"variant: no convert-copy-construct from element with Clang 11 or later" );
#else
int i = 7;

variant<double, std::string> var1( i );
Expand All @@ -530,23 +556,25 @@ CASE( "variant: Allows to convert-copy-construct from element" )

EXPECT( var2.index() == 0u );
EXPECT( get<0>(var2) == lest::approx(7) );
#else
EXPECT( !!"variant: no convert-copy-construct from element with std::variant (VS2019/VC142/1920)" );
#endif
}

CASE( "variant: Allows to convert-move-construct from element (C++11)" )
{
#if variant_CPP11_OR_GREATER
#if !( defined(_MSC_VER) && variant_t_BETWEEN(_MSC_VER, 1920, 1930 ) && variant_USES_STD_VARIANT )
#if ( defined(_MSC_VER) && variant_t_BETWEEN(_MSC_VER, 1920, 1930 ) && variant_USES_STD_VARIANT )
EXPECT( !!"variant: no convert-copy-construct from element with std::variant (VS2019/VC142/1920)" );
#elif ( variant_USES_STD_VARIANT && variant_COMPILER_GNUC_VERSION >= 1010 )
EXPECT( !!"variant: no convert-copy-construct from element with GCC 10.1 or later" );
#elif ( variant_USES_STD_VARIANT && variant_COMPILER_CLANG_VERSION >= 1100 )
EXPECT( !!"variant: no convert-copy-construct from element with Clang 11 or later" );
#else
struct Int { operator int() { return 7; } };

variant<double, std::string> var( Int{} );

EXPECT( var.index() == 0u );
EXPECT( get<0>(var) == lest::approx(7) );
#else
EXPECT( !!"variant: no convert-copy-construct from element with std::variant (VS2019/VC142/1920)" );
#endif
#else
EXPECT( !!"variant: move-construction is not available (no C++11)" );
Expand Down Expand Up @@ -1640,7 +1668,7 @@ namespace issue_31 {
CopyOnly( CopyOnly const & ) {}
CopyOnly & operator=( CopyOnly const & ) { return *this; }

#if variant_CPP11_OR_GREATER
#if variant_CPP11_OR_GREATER && !(variant_USES_STD_VARIANT && defined(_LIBCPP_VERSION))
CopyOnly( CopyOnly && ) = delete;
CopyOnly & operator=( CopyOnly && ) = delete;
#endif
Expand Down
Loading