From d1cc5964c4bcf4d0165305b44aa72cc0dbf3b241 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 8 Oct 2020 18:17:35 -0500 Subject: [PATCH] fix GCC compile --- Engine/source/T3D/assets/ImageAsset.h | 8 ++++---- Engine/source/T3D/rigidShape.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index 1b4925aef..0a0a7dbb4 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/Engine/source/T3D/assets/ImageAsset.h @@ -145,13 +145,13 @@ DefineEnumType(ImageAssetType); StringTableEntry m##name##AssetId;\ AssetPtr m##name##Asset;\ public: \ - const String& get##name##() const { return m##name##Filename; }\ - void set##name##(FileName _in) { m##name##Filename = _in; }\ + const String& get##name() const { return m##name##Filename; }\ + void set##name(FileName _in) { m##name##Filename = _in; }\ const AssetPtr & get##name##Asset() const { return m##name##Asset; }\ void set##name##Asset(AssetPtr_in) { m##name##Asset = _in; } -#define GET_TEXTUREMAP(name) get##name##() -#define SET_TEXTUREMAP(name,_in) set##name##(_in) +#define GET_TEXTUREMAP(name) get##name() +#define SET_TEXTUREMAP(name,_in) set##name(_in) #define GET_TEXTUREASSET(name) get##name##Asset() #define SET_TEXTUREASSET(name,_in) set##name##Asset(_in) diff --git a/Engine/source/T3D/rigidShape.h b/Engine/source/T3D/rigidShape.h index 1290661f2..0389f2a72 100644 --- a/Engine/source/T3D/rigidShape.h +++ b/Engine/source/T3D/rigidShape.h @@ -38,7 +38,7 @@ class ParticleEmitter; class ParticleEmitterData; class ClippedPolyList; - +class RigidShape; class RigidShapeData : public ShapeBaseData { typedef ShapeBaseData Parent;