From 815832152d9b377d1958edf001d6c7add63c27be Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Mon, 18 Mar 2024 19:58:47 +0000 Subject: [PATCH] changes on macosx mac picked up a couple of left over issues. --- Engine/source/console/consoleObject.h | 2 +- Engine/source/console/engineObject.h | 2 +- Engine/source/math/util/decomposePoly.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/console/consoleObject.h b/Engine/source/console/consoleObject.h index de168567e..634b60225 100644 --- a/Engine/source/console/consoleObject.h +++ b/Engine/source/console/consoleObject.h @@ -1205,7 +1205,7 @@ inline bool& ConsoleObject::getDynamicGroupExpand() static SimObjectRefConsoleBaseType< className > ptrRefType; \ static AbstractClassRep::WriteCustomTamlSchema getStaticWriteCustomTamlSchema(); \ static AbstractClassRep* getContainerChildStaticClassRep(); \ - virtual AbstractClassRep* getClassRep() const + AbstractClassRep* getClassRep() const override #define DECLARE_CATEGORY( string ) \ static const char* __category() { return string; } diff --git a/Engine/source/console/engineObject.h b/Engine/source/console/engineObject.h index 8ab9a6324..83297d09f 100644 --- a/Engine/source/console/engineObject.h +++ b/Engine/source/console/engineObject.h @@ -258,7 +258,7 @@ class EngineObject; static EngineClassTypeInfo< ThisType, _ClassBase > _smTypeInfo; \ static EngineExportScope& __engineExportScope(); \ static EnginePropertyTable& _smPropertyTable; \ - virtual const EngineTypeInfo* __typeinfo() const; \ + const EngineTypeInfo* __typeinfo() const override; \ public: /// Declare an abstract class @a type derived from the class @a super. diff --git a/Engine/source/math/util/decomposePoly.h b/Engine/source/math/util/decomposePoly.h index 884ac6123..8722bd3b8 100644 --- a/Engine/source/math/util/decomposePoly.h +++ b/Engine/source/math/util/decomposePoly.h @@ -16,7 +16,7 @@ public: inline bool twoIndices::operator==(const twoIndices& _test) const { - return ((i1 == _test.i1) && (i2 == _test.i2) || (i1 == _test.i2) && (i2 == _test.i1)); + return (((i1 == _test.i1) && (i2 == _test.i2)) || ((i1 == _test.i2) && (i2 == _test.i1))); }