From b2b348d4baf2891fd82635e068a4f64d2694ba6d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Oct 2012 15:15:39 +0300 Subject: Fix compilation warnings without C++11 support. --- src/resources/action.h | 2 +- src/resources/ambientlayer.h | 2 +- src/resources/atlasmanager.h | 8 ++++---- src/resources/beinginfo.h | 4 ++-- src/resources/dye.h | 4 ++-- src/resources/emotedb.h | 4 ++-- src/resources/image.h | 2 +- src/resources/imagehelper.h | 2 +- src/resources/imageset.h | 2 +- src/resources/iteminfo.h | 2 +- src/resources/music.h | 2 +- src/resources/openglimagehelper.h | 2 +- src/resources/resource.h | 2 +- src/resources/resourcemanager.h | 2 +- src/resources/sdlimagehelper.h | 2 +- src/resources/soundeffect.h | 2 +- src/resources/specialdb.h | 2 +- src/resources/spritedef.h | 4 ++-- src/resources/subimage.h | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/resources') diff --git a/src/resources/action.h b/src/resources/action.h index 4cfb498f1..ea1e1d195 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -37,7 +37,7 @@ class Action final public: Action(); - A_DELETE_COPY(Action); + A_DELETE_COPY(Action) ~Action(); diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h index 6c051774e..e5dac80bc 100644 --- a/src/resources/ambientlayer.h +++ b/src/resources/ambientlayer.h @@ -44,7 +44,7 @@ class AmbientLayer final const float speedX, const float speedY, const bool keepRatio = false); - A_DELETE_COPY(AmbientLayer); + A_DELETE_COPY(AmbientLayer) ~AmbientLayer(); diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h index 4976185a7..fd0beb4cd 100644 --- a/src/resources/atlasmanager.h +++ b/src/resources/atlasmanager.h @@ -42,7 +42,7 @@ struct AtlasItem { } - A_DELETE_COPY(AtlasItem); + A_DELETE_COPY(AtlasItem) Image *image; std::string name; @@ -62,7 +62,7 @@ struct TextureAtlas { } - A_DELETE_COPY(TextureAtlas); + A_DELETE_COPY(TextureAtlas) std::string name; Image *atlasImage; @@ -78,7 +78,7 @@ class AtlasResource : public Resource AtlasResource() { } - A_DELETE_COPY(AtlasResource); + A_DELETE_COPY(AtlasResource) ~AtlasResource(); @@ -94,7 +94,7 @@ class AtlasManager public: AtlasManager(); - A_DELETE_COPY(AtlasManager); + A_DELETE_COPY(AtlasManager) static AtlasResource *loadTextureAtlas(const std::string &name, const StringVect &files); diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index f5e9650c1..8f3d09001 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -49,7 +49,7 @@ struct Attack final { } - A_DELETE_COPY(Attack); + A_DELETE_COPY(Attack) }; typedef std::map Attacks; @@ -83,7 +83,7 @@ class BeingInfo final BeingInfo(); - A_DELETE_COPY(BeingInfo); + A_DELETE_COPY(BeingInfo) ~BeingInfo(); diff --git a/src/resources/dye.h b/src/resources/dye.h index 0795f1276..d3960f04c 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -47,7 +47,7 @@ class DyePalette final */ DyePalette(const std::string &pallete, const int8_t blockSize); - A_DELETE_COPY(DyePalette); + A_DELETE_COPY(DyePalette) /** * Gets a pixel color depending on its intensity. First color is @@ -104,7 +104,7 @@ class Dye final */ Dye(const std::string &dye); - A_DELETE_COPY(Dye); + A_DELETE_COPY(Dye) /** * Destroys the associated palettes. diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h index 1083980e2..6389d9ada 100644 --- a/src/resources/emotedb.h +++ b/src/resources/emotedb.h @@ -37,7 +37,7 @@ struct EmoteSprite final sprite(nullptr) { } - A_DELETE_COPY(EmoteSprite); + A_DELETE_COPY(EmoteSprite) const AnimatedSprite *sprite; std::string name; @@ -48,7 +48,7 @@ struct EmoteInfo final EmoteInfo() { } - A_DELETE_COPY(EmoteInfo); + A_DELETE_COPY(EmoteInfo) std::list sprites; StringVect particles; diff --git a/src/resources/image.h b/src/resources/image.h index 3374c8697..3752965bc 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -65,7 +65,7 @@ class Image : public Resource #endif public: - A_DELETE_COPY(Image); + A_DELETE_COPY(Image) /** * Destructor. diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h index ddd4ace97..2d25091fd 100644 --- a/src/resources/imagehelper.h +++ b/src/resources/imagehelper.h @@ -46,7 +46,7 @@ class ImageHelper ImageHelper() { } - A_DELETE_COPY(ImageHelper); + A_DELETE_COPY(ImageHelper) virtual ~ImageHelper() { } diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 35a429329..b87891249 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -43,7 +43,7 @@ class ImageSet : public Resource ImageSet(Image *const img, const int w, const int h, const int margin = 0, const int spacing = 0); - A_DELETE_COPY(ImageSet); + A_DELETE_COPY(ImageSet) /** * Destructor. diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 704ad79eb..4e4e9f424 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -105,7 +105,7 @@ class ItemInfo final */ ItemInfo(); - A_DELETE_COPY(ItemInfo); + A_DELETE_COPY(ItemInfo) ~ItemInfo(); diff --git a/src/resources/music.h b/src/resources/music.h index 0e459c724..d1e3d1836 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -39,7 +39,7 @@ class Music final : public Resource mMusic(nullptr) { } - A_DELETE_COPY(Music); + A_DELETE_COPY(Music) /** * Destructor. diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h index 75a6c52ad..02641f85f 100644 --- a/src/resources/openglimagehelper.h +++ b/src/resources/openglimagehelper.h @@ -53,7 +53,7 @@ class OpenGLImageHelper final : public ImageHelper { } - A_DELETE_COPY(OpenGLImageHelper); + A_DELETE_COPY(OpenGLImageHelper) virtual ~OpenGLImageHelper() { } diff --git a/src/resources/resource.h b/src/resources/resource.h index 4df9b47a0..9f07ead75 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -51,7 +51,7 @@ class Resource { } - A_DELETE_COPY(Resource); + A_DELETE_COPY(Resource) /** * Increments the internal reference count. diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index dcd909aa7..5cf9e6e8a 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -62,7 +62,7 @@ class ResourceManager final ResourceManager(); - A_DELETE_COPY(ResourceManager); + A_DELETE_COPY(ResourceManager) /** * Destructor. Cleans up remaining resources, warning about resources diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h index 3c790e7b7..ab91825b3 100644 --- a/src/resources/sdlimagehelper.h +++ b/src/resources/sdlimagehelper.h @@ -43,7 +43,7 @@ class SDLImageHelper final : public ImageHelper SDLImageHelper() { } - A_DELETE_COPY(SDLImageHelper); + A_DELETE_COPY(SDLImageHelper) virtual ~SDLImageHelper() { } diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 229977c2a..8c30aed48 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -35,7 +35,7 @@ class SoundEffect final : public Resource { public: - A_DELETE_COPY(SoundEffect); + A_DELETE_COPY(SoundEffect) /** * Destructor. diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h index 9a01cf7d2..725542a29 100644 --- a/src/resources/specialdb.h +++ b/src/resources/specialdb.h @@ -40,7 +40,7 @@ struct SpecialInfo final rechargeCurrent(0) { } - A_DELETE_COPY(SpecialInfo); + A_DELETE_COPY(SpecialInfo) enum TargetMode { diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 09e5171e4..58ac6cfe9 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -49,7 +49,7 @@ struct SpriteReference final { } - A_DELETE_COPY(SpriteReference); + A_DELETE_COPY(SpriteReference) std::string sprite; int variant; @@ -112,7 +112,7 @@ enum SpriteDirection class SpriteDef final : public Resource { public: - A_DELETE_COPY(SpriteDef); + A_DELETE_COPY(SpriteDef) /** * Loads a sprite definition file. diff --git a/src/resources/subimage.h b/src/resources/subimage.h index c30b39177..47d8476cb 100644 --- a/src/resources/subimage.h +++ b/src/resources/subimage.h @@ -59,7 +59,7 @@ class SubImage final : public Image const int texWidth, const int textHeight); #endif - A_DELETE_COPY(SubImage); + A_DELETE_COPY(SubImage) /** * Destructor. -- cgit v1.2.3-60-g2f50