From 3bdbe5965e324d815cc2a78601b65c36c98dc38e Mon Sep 17 00:00:00 2001 From: Glenn Smith Date: Sun, 1 Jan 2023 22:55:26 -0500 Subject: [PATCH] Fix some compiler warnings on macos --- Engine/source/T3D/assets/SoundAsset.h | 2 +- Engine/source/platform/platformIntrinsics.gcc.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Engine/source/T3D/assets/SoundAsset.h b/Engine/source/T3D/assets/SoundAsset.h index 8f804dc00..573063351 100644 --- a/Engine/source/T3D/assets/SoundAsset.h +++ b/Engine/source/T3D/assets/SoundAsset.h @@ -159,7 +159,7 @@ DefineConsoleType(TypeSoundAssetId, String) AssetPtr 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());}\ diff --git a/Engine/source/platform/platformIntrinsics.gcc.h b/Engine/source/platform/platformIntrinsics.gcc.h index 1acc8245e..f846126db 100644 --- a/Engine/source/platform/platformIntrinsics.gcc.h +++ b/Engine/source/platform/platformIntrinsics.gcc.h @@ -27,6 +27,8 @@ /// Compiler intrinsics for GCC. #ifdef TORQUE_OS_MAC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include #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_