Browse Source

Fix some compiler warnings on macos

Glenn Smith 2 years ago
parent
commit
3bdbe5965e

+ 1 - 1
Engine/source/T3D/assets/SoundAsset.h

@@ -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 - 0
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 <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_