Ver Fonte

changes on macosx

mac picked up a couple of left over issues.
marauder2k7 há 1 ano atrás
pai
commit
815832152d

+ 1 - 1
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; }

+ 1 - 1
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.

+ 1 - 1
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)));
 }