Skip to content

Commit b4daae8

Browse files
author
Julian LALU
committed
Fix compilation for non MSVC
1 parent 0152787 commit b4daae8

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

interface/core/containers/compressed_tuple.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,13 @@ namespace hud
189189
template<typename index_seq_t, typename... types_t>
190190
struct compressed_tuple_impl;
191191

192+
/** We need this to force MSVC to do EBCO of multiple inheritance. */
192193
#if defined(HD_COMPILER_CLANG_CL) || defined(HD_COMPILER_MSVC)
193194
#define EBCO_MSVC __declspec(empty_bases)
195+
#else
196+
#define EBCO_MSVC
194197
#endif
198+
195199
template<usize... indices, typename... types_t>
196200
struct EBCO_MSVC compressed_tuple_impl<index_sequence<indices...>, types_t...>
197201
: tuple_leaf_select<indices, types_t>::type...
@@ -259,7 +263,6 @@ namespace hud
259263
template<usize count>
260264
struct tuple_assign
261265
{
262-
263266
/**
264267
* Assign a 2 compressed_tuple elements.
265268
* @tparam types_t... List of types_t of the compressed_tuple to

0 commit comments

Comments
 (0)