mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 08:04:40 +00:00
Fix some compiler warnings on macos
This commit is contained in:
parent
10d61e3a37
commit
3bdbe5965e
2 changed files with 7 additions and 1 deletions
|
|
@ -159,7 +159,7 @@ DefineConsoleType(TypeSoundAssetId, String)
|
||||||
AssetPtr<SoundAsset> m##name##Asset = NULL;\
|
AssetPtr<SoundAsset> m##name##Asset = NULL;\
|
||||||
SFXProfile* m##name##Profile = NULL;\
|
SFXProfile* m##name##Profile = NULL;\
|
||||||
SFXDescription* m##name##Desc = NULL;\
|
SFXDescription* m##name##Desc = NULL;\
|
||||||
SimObjectId m##name##SFXId = NULL;\
|
SimObjectId m##name##SFXId = 0;\
|
||||||
public: \
|
public: \
|
||||||
const StringTableEntry get##name##File() const { return m##name##Name; }\
|
const StringTableEntry get##name##File() const { return m##name##Name; }\
|
||||||
void set##name##File(const FileName &_in) { m##name##Name = StringTable->insert(_in.c_str());}\
|
void set##name##File(const FileName &_in) { m##name##Name = StringTable->insert(_in.c_str());}\
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,8 @@
|
||||||
/// Compiler intrinsics for GCC.
|
/// Compiler intrinsics for GCC.
|
||||||
|
|
||||||
#ifdef TORQUE_OS_MAC
|
#ifdef TORQUE_OS_MAC
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
#include <libkern/OSAtomic.h>
|
#include <libkern/OSAtomic.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -85,4 +87,8 @@ inline U32 dAtomicRead( volatile U32 &ref )
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef TORQUE_OS_MAC
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // _TORQUE_PLATFORM_PLATFORMINTRINSICS_GCC_H_
|
#endif // _TORQUE_PLATFORM_PLATFORMINTRINSICS_GCC_H_
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue