TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update engineAPI.h

Browse source 
remove static inline and replace for static.

static inline is not C compliant.
This commit is contained in:
marauder2k7 2024-03-19 22:20:48 +00:00
parent 7874c0ae27
commit a3742d26fb
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/console/engineAPI.h
View file

@ -674,7 +674,7 @@ public:
/// } /// }
/// @endcode /// @endcode
#define DefineEngineFunction( name, returnType, args, defaultArgs, usage ) \ #define DefineEngineFunction( name, returnType, args, defaultArgs, usage ) \
static inline returnType _fn ## name ## impl args; \ static returnType _fn ## name ## impl args; \
TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## name \ TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## name \
( _EngineFunctionTrampoline< returnType args >::Args a ) \ ( _EngineFunctionTrampoline< returnType args >::Args a ) \
{ \ { \
@ -709,7 +709,7 @@ public:
_EngineConsoleThunk< 1, returnType args >::NUM_ARGS, \ _EngineConsoleThunk< 1, returnType args >::NUM_ARGS, \
false, &_ ## name ## header \ false, &_ ## name ## header \
); \ ); \
static inline returnType _fn ## name ## impl args static returnType _fn ## name ## impl args
// The next thing is a bit tricky. DefineEngineMethod allows to make the 'object' (=this) argument to the function // The next thing is a bit tricky. DefineEngineMethod allows to make the 'object' (=this) argument to the function
@ -811,7 +811,7 @@ public:
/// } /// }
/// @endcode /// @endcode
#define DefineEngineStaticMethod( className, name, returnType, args, defaultArgs, usage ) \ #define DefineEngineStaticMethod( className, name, returnType, args, defaultArgs, usage ) \
static inline returnType _fn ## className ## name ## impl args; \ static returnType _fn ## className ## name ## impl args; \
TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## className ## _ ## name \ TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## className ## _ ## name \
( _EngineFunctionTrampoline< returnType args >::Args a ) \ ( _EngineFunctionTrampoline< returnType args >::Args a ) \
{ \ { \
@ -846,10 +846,10 @@ public:
_EngineConsoleThunk< 1, returnType args >::NUM_ARGS, \ _EngineConsoleThunk< 1, returnType args >::NUM_ARGS, \
false, &_ ## className ## name ## header \ false, &_ ## className ## name ## header \
); \ ); \
static inline returnType _fn ## className ## name ## impl args static returnType _fn ## className ## name ## impl args
# define DefineEngineStringlyVariadicFunction(name,returnType,minArgs,maxArgs,usage) \ # define DefineEngineStringlyVariadicFunction(name,returnType,minArgs,maxArgs,usage) \
static inline returnType _fn ## name ## impl (SimObject *, S32 argc, ConsoleValue *argv); \ static returnType _fn ## name ## impl (SimObject *, S32 argc, ConsoleValue *argv); \
TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## name \ TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## name \
(Vector<const char*>* vec) \ (Vector<const char*>* vec) \
{ \ { \
@ -921,7 +921,7 @@ public:
// can be removed and all their uses be replaced with their corresponding versions that now still include support // can be removed and all their uses be replaced with their corresponding versions that now still include support
// for the console (e.g. DefineNewEngineFunction should become DefineEngineFunction). // for the console (e.g. DefineNewEngineFunction should become DefineEngineFunction).
#define DefineNewEngineFunction( name, returnType, args, defaultArgs, usage ) \ #define DefineNewEngineFunction( name, returnType, args, defaultArgs, usage ) \
static inline returnType _fn ## name ## impl args; \ static returnType _fn ## name ## impl args; \
TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## name \ TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## name \
( _EngineFunctionTrampoline< returnType args >::Args a ) \ ( _EngineFunctionTrampoline< returnType args >::Args a ) \
{ \ { \
@ -942,7 +942,7 @@ public:
( void* ) &fn ## name, \ ( void* ) &fn ## name, \
0 \ 0 \
); \ ); \
static inline returnType _fn ## name ## impl args static returnType _fn ## name ## impl args
#define DefineNewEngineMethod( className, name, returnType, args, defaultArgs, usage ) \ #define DefineNewEngineMethod( className, name, returnType, args, defaultArgs, usage ) \
struct _ ## className ## name ## frame \ struct _ ## className ## name ## frame \
@ -968,7 +968,7 @@ public:
returnType _ ## className ## name ## frame::_exec args const returnType _ ## className ## name ## frame::_exec args const
#define DefineNewEngineStaticMethod( className, name, returnType, args, defaultArgs, usage ) \ #define DefineNewEngineStaticMethod( className, name, returnType, args, defaultArgs, usage ) \
static inline returnType _fn ## className ## name ## impl args; \ static returnType _fn ## className ## name ## impl args; \
TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## className ## _ ## name \ TORQUE_API EngineTypeTraits< returnType >::ReturnValueType fn ## className ## _ ## name \
( _EngineFunctionTrampoline< returnType args >::Args a ) \ ( _EngineFunctionTrampoline< returnType args >::Args a ) \
{ \ { \
@ -989,7 +989,7 @@ public:
( void* ) &fn ## className ## _ ## name, \ ( void* ) &fn ## className ## _ ## name, \
0 \ 0 \
); \ ); \
static inline returnType _fn ## className ## name ## impl args static returnType _fn ## className ## name ## impl args
/// @} /// @}