Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a couple casts for compiling with C++

Browse Source 
Also avoid using __builtin_types_compatible_p, which seems broken with C++?
This commit is contained in:
Chris Robinson
2018-10-28 17:42:20 -07:00
parent 1d7b0f54be
commit 7d5a288e83
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/polymorphism.h
+3 -3
View File
@@ -4,7 +4,7 @@
/* Macros to declare inheriting types, and to (down-)cast and up-cast. */
#define DERIVE_FROM_TYPE(t) t t##_parent
#define STATIC_CAST(to, obj) (&(obj)->to##_parent)
#ifdef __GNUC__
#if defined(__GNUC__) && !defined(__cplusplus)
#define STATIC_UPCAST(to, from, obj) __extension__({ \
static_assert(__builtin_types_compatible_p(from, __typeof(*(obj))), \
"Invalid upcast object from type"); \
@@ -74,14 +74,14 @@ static void T##_Delete(void *ptr) { al_free(ptr); }
/* Allocate and construct an object, with arguments. */
#define NEW_OBJ(_res, T) do { \
_res = T##_New(sizeof(T)); \
_res = (T*)T##_New(sizeof(T)); \
if(_res) \
{ \
memset(_res, 0, sizeof(T)); \
T##_Construct(_res, EXTRACT_NEW_ARGS
/* Allocate and construct an object, with no arguments. */
#define NEW_OBJ0(_res, T) do { \
_res = T##_New(sizeof(T)); \
_res = (T*)T##_New(sizeof(T)); \
if(_res) \
{ \
memset(_res, 0, sizeof(T)); \