From 1d8d1240cad863ab853123b874d78d677ce26e07 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 23 Jun 2016 10:38:46 -0700 Subject: [PATCH] remove override to avoid new Jenkins OSX warnings --- libraries/entities/src/ParticleEffectEntityItem.h | 4 ++-- libraries/entities/src/ZoneEntityItem.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/entities/src/ParticleEffectEntityItem.h b/libraries/entities/src/ParticleEffectEntityItem.h index 777f3b6cf6..9ddda62c8b 100644 --- a/libraries/entities/src/ParticleEffectEntityItem.h +++ b/libraries/entities/src/ParticleEffectEntityItem.h @@ -95,8 +95,8 @@ public: void setAlphaSpread(float alphaSpread); float getAlphaSpread() const { return _alphaSpread; } - void setShapeType(ShapeType type) override; - virtual ShapeType getShapeType() const override { return _shapeType; } + void setShapeType(ShapeType type); + virtual ShapeType getShapeType() const { return _shapeType; } virtual void debugDump() const; diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h index 599e70f83e..f0f2a91d63 100644 --- a/libraries/entities/src/ZoneEntityItem.h +++ b/libraries/entities/src/ZoneEntityItem.h @@ -54,9 +54,9 @@ public: static bool getDrawZoneBoundaries() { return _drawZoneBoundaries; } static void setDrawZoneBoundaries(bool value) { _drawZoneBoundaries = value; } - virtual bool isReadyToComputeShape() override { return false; } - void setShapeType(ShapeType type) override { _shapeType = type; } - virtual ShapeType getShapeType() const override; + virtual bool isReadyToComputeShape() { return false; } + void setShapeType(ShapeType type) { _shapeType = type; } + virtual ShapeType getShapeType() const; virtual bool hasCompoundShapeURL() const { return !_compoundShapeURL.isEmpty(); } const QString getCompoundShapeURL() const { return _compoundShapeURL; }