mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-16 09:04:38 +00:00
changes on macosx
mac picked up a couple of left over issues.
This commit is contained in:
parent
7c7e3c8bf8
commit
815832152d
3 changed files with 3 additions and 3 deletions
|
|
@ -1205,7 +1205,7 @@ inline bool& ConsoleObject::getDynamicGroupExpand()
|
||||||
static SimObjectRefConsoleBaseType< className > ptrRefType; \
|
static SimObjectRefConsoleBaseType< className > ptrRefType; \
|
||||||
static AbstractClassRep::WriteCustomTamlSchema getStaticWriteCustomTamlSchema(); \
|
static AbstractClassRep::WriteCustomTamlSchema getStaticWriteCustomTamlSchema(); \
|
||||||
static AbstractClassRep* getContainerChildStaticClassRep(); \
|
static AbstractClassRep* getContainerChildStaticClassRep(); \
|
||||||
virtual AbstractClassRep* getClassRep() const
|
AbstractClassRep* getClassRep() const override
|
||||||
|
|
||||||
#define DECLARE_CATEGORY( string ) \
|
#define DECLARE_CATEGORY( string ) \
|
||||||
static const char* __category() { return string; }
|
static const char* __category() { return string; }
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ class EngineObject;
|
||||||
static EngineClassTypeInfo< ThisType, _ClassBase > _smTypeInfo; \
|
static EngineClassTypeInfo< ThisType, _ClassBase > _smTypeInfo; \
|
||||||
static EngineExportScope& __engineExportScope(); \
|
static EngineExportScope& __engineExportScope(); \
|
||||||
static EnginePropertyTable& _smPropertyTable; \
|
static EnginePropertyTable& _smPropertyTable; \
|
||||||
virtual const EngineTypeInfo* __typeinfo() const; \
|
const EngineTypeInfo* __typeinfo() const override; \
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/// Declare an abstract class @a type derived from the class @a super.
|
/// Declare an abstract class @a type derived from the class @a super.
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ public:
|
||||||
|
|
||||||
inline bool twoIndices::operator==(const twoIndices& _test) const
|
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)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue