TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-02 20:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #945 from CouleeApps/fix_macos_warnings

Browse source 
Fix some compiler warnings on macos
This commit is contained in:
Brian Roberts 2023-01-02 01:02:52 -06:00 • committed by GitHub
commit 35e7a204cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/assets/SoundAsset.h
View file

@ -159,7 +159,7 @@ DefineConsoleType(TypeSoundAssetId, String)
AssetPtr<SoundAsset> m##name##Asset = NULL;\
SFXProfile* m##name##Profile = NULL;\
SFXDescription* m##name##Desc = NULL;\
SimObjectId m##name##SFXId = NULL;\
SimObjectId m##name##SFXId = 0;\
public: \
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());}\

6
Engine/source/platform/platformIntrinsics.gcc.h
View file

@ -27,6 +27,8 @@
/// Compiler intrinsics for GCC.
#ifdef TORQUE_OS_MAC
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <libkern/OSAtomic.h>
#endif
@ -85,4 +87,8 @@ inline U32 dAtomicRead( volatile U32 &ref )
#endif
}
#ifdef TORQUE_OS_MAC
#pragma GCC diagnostic pop
#endif
#endif // _TORQUE_PLATFORM_PLATFORMINTRINSICS_GCC_H_