summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-17 21:34:43 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-17 21:34:43 +0300
commitaaec42df1ea3fbc8ef8cac43c8d0661c633a61c6 (patch)
treeb2fd0758f7309bbe1384111b7390af8a3d6f0031
parentf3f6be9b3f332910ef191f9b96e0dd6121543310 (diff)
downloadmanaplus-aaec42df1ea3fbc8ef8cac43c8d0661c633a61c6.tar.gz
manaplus-aaec42df1ea3fbc8ef8cac43c8d0661c633a61c6.tar.bz2
manaplus-aaec42df1ea3fbc8ef8cac43c8d0661c633a61c6.tar.xz
manaplus-aaec42df1ea3fbc8ef8cac43c8d0661c633a61c6.zip
Fix compilation with old compilers.
-rw-r--r--src/resources/cursors.h2
-rw-r--r--src/resources/itemtypemap.h2
-rw-r--r--src/resources/loaders/atlasloader.cpp2
-rw-r--r--src/resources/loaders/emptyatlasloader.cpp2
-rw-r--r--src/resources/loaders/imageloader.cpp2
-rw-r--r--src/resources/loaders/imagesetloader.cpp2
-rw-r--r--src/resources/loaders/musicloader.cpp2
-rw-r--r--src/resources/loaders/rescaledloader.cpp2
-rw-r--r--src/resources/loaders/shaderloader.cpp2
-rw-r--r--src/resources/loaders/shaderprogramloader.cpp2
-rw-r--r--src/resources/loaders/soundloader.cpp2
-rw-r--r--src/resources/loaders/spritedefloader.cpp2
-rw-r--r--src/resources/loaders/subimageloader.cpp2
-rw-r--r--src/resources/loaders/subimagesetloader.cpp2
-rw-r--r--src/resources/loaders/walklayerloader.cpp2
-rw-r--r--src/resources/loaders/xmlloader.cpp2
-rw-r--r--src/resources/skill/skilltypeentry.h2
17 files changed, 17 insertions, 17 deletions
diff --git a/src/resources/cursors.h b/src/resources/cursors.h
index 3a82b1a10..4dfeab87c 100644
--- a/src/resources/cursors.h
+++ b/src/resources/cursors.h
@@ -31,7 +31,7 @@ namespace Cursors
{
struct StrToCursor final
{
- A_DELETE_COPY(StrToCursor)
+ A_DEFAULT_COPY(StrToCursor)
std::string str;
CursorT cursor;
diff --git a/src/resources/itemtypemap.h b/src/resources/itemtypemap.h
index 446692245..9cf43d017 100644
--- a/src/resources/itemtypemap.h
+++ b/src/resources/itemtypemap.h
@@ -29,7 +29,7 @@
struct ItemTypeMap final
{
- A_DELETE_COPY(ItemTypeMap)
+ A_DEFAULT_COPY(ItemTypeMap)
std::string name;
ItemDbTypeT type;
diff --git a/src/resources/loaders/atlasloader.cpp b/src/resources/loaders/atlasloader.cpp
index ec14f03ff..c5f6691a3 100644
--- a/src/resources/loaders/atlasloader.cpp
+++ b/src/resources/loaders/atlasloader.cpp
@@ -33,7 +33,7 @@
struct AtlasLoader final
{
- A_DELETE_COPY(AtlasLoader)
+ A_DEFAULT_COPY(AtlasLoader)
const std::string name;
const StringVect *const files;
diff --git a/src/resources/loaders/emptyatlasloader.cpp b/src/resources/loaders/emptyatlasloader.cpp
index e3dfa7734..81d99cd51 100644
--- a/src/resources/loaders/emptyatlasloader.cpp
+++ b/src/resources/loaders/emptyatlasloader.cpp
@@ -33,7 +33,7 @@
struct EmptyAtlasLoader final
{
- A_DELETE_COPY(EmptyAtlasLoader)
+ A_DEFAULT_COPY(EmptyAtlasLoader)
const std::string name;
const StringVect *const files;
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index f1917d5cc..87abf97bb 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -39,7 +39,7 @@ namespace
{
struct DyedImageLoader final
{
- A_DELETE_COPY(DyedImageLoader)
+ A_DEFAULT_COPY(DyedImageLoader)
std::string path;
static Resource *load(const void *const v)
diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp
index 66a380397..6ec02c699 100644
--- a/src/resources/loaders/imagesetloader.cpp
+++ b/src/resources/loaders/imagesetloader.cpp
@@ -40,7 +40,7 @@ struct ImageSetLoader final
const int w;
const int h;
- A_DELETE_COPY(ImageSetLoader)
+ A_DEFAULT_COPY(ImageSetLoader)
static Resource *load(const void *const v)
{
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index c8f79f7b6..1a5ae19b2 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -35,7 +35,7 @@ namespace
{
struct ResourceLoader final
{
- A_DELETE_COPY(ResourceLoader)
+ A_DEFAULT_COPY(ResourceLoader)
const std::string path;
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index 4f4c9b7b0..c4c315227 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -35,7 +35,7 @@ namespace
{
struct RescaledLoader final
{
- A_DELETE_COPY(RescaledLoader)
+ A_DEFAULT_COPY(RescaledLoader)
const Image *const image;
const int width;
diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp
index 291201684..f06c9d219 100644
--- a/src/resources/loaders/shaderloader.cpp
+++ b/src/resources/loaders/shaderloader.cpp
@@ -37,7 +37,7 @@ namespace
{
struct ShaderLoader final
{
- A_DELETE_COPY(ShaderLoader)
+ A_DEFAULT_COPY(ShaderLoader)
const std::string name;
const unsigned int type;
diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp
index 682f89d6c..d48e1aa9f 100644
--- a/src/resources/loaders/shaderprogramloader.cpp
+++ b/src/resources/loaders/shaderprogramloader.cpp
@@ -37,7 +37,7 @@ namespace
{
struct ShaderProgramLoader final
{
- A_DELETE_COPY(ShaderProgramLoader)
+ A_DEFAULT_COPY(ShaderProgramLoader)
const std::string vertex;
const std::string fragment;
diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp
index 0eb7f0200..172170b94 100644
--- a/src/resources/loaders/soundloader.cpp
+++ b/src/resources/loaders/soundloader.cpp
@@ -35,7 +35,7 @@ namespace
{
struct ResourceLoader final
{
- A_DELETE_COPY(ResourceLoader)
+ A_DEFAULT_COPY(ResourceLoader)
const std::string path;
diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp
index ef37d2315..c140c8f73 100644
--- a/src/resources/loaders/spritedefloader.cpp
+++ b/src/resources/loaders/spritedefloader.cpp
@@ -36,7 +36,7 @@ namespace
{
struct SpriteDefLoader final
{
- A_DELETE_COPY(SpriteDefLoader)
+ A_DEFAULT_COPY(SpriteDefLoader)
const std::string path;
const int variant;
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp
index ce9177995..f2f7ad7de 100644
--- a/src/resources/loaders/subimageloader.cpp
+++ b/src/resources/loaders/subimageloader.cpp
@@ -35,7 +35,7 @@ namespace
{
struct SubImageLoader final
{
- A_DELETE_COPY(SubImageLoader)
+ A_DEFAULT_COPY(SubImageLoader)
Image *const parent;
const int x;
diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp
index 1dcaffcc8..c8d0fba74 100644
--- a/src/resources/loaders/subimagesetloader.cpp
+++ b/src/resources/loaders/subimagesetloader.cpp
@@ -36,7 +36,7 @@ namespace
{
struct SubImageSetLoader final
{
- A_DELETE_COPY(SubImageSetLoader)
+ A_DEFAULT_COPY(SubImageSetLoader)
Image *const parent;
int width;
diff --git a/src/resources/loaders/walklayerloader.cpp b/src/resources/loaders/walklayerloader.cpp
index 4fbac1010..71f94539a 100644
--- a/src/resources/loaders/walklayerloader.cpp
+++ b/src/resources/loaders/walklayerloader.cpp
@@ -35,7 +35,7 @@
#ifndef DYECMD
struct WalkLayerLoader final
{
- A_DELETE_COPY(WalkLayerLoader)
+ A_DEFAULT_COPY(WalkLayerLoader)
const std::string name;
const Map *const map;
diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp
index 31e61df6d..647b45664 100644
--- a/src/resources/loaders/xmlloader.cpp
+++ b/src/resources/loaders/xmlloader.cpp
@@ -32,7 +32,7 @@ namespace
{
struct ResourceLoader final
{
- A_DELETE_COPY(ResourceLoader)
+ A_DEFAULT_COPY(ResourceLoader)
const std::string path;
const UseResman useResman;
diff --git a/src/resources/skill/skilltypeentry.h b/src/resources/skill/skilltypeentry.h
index 7f85943c0..fdb1604fe 100644
--- a/src/resources/skill/skilltypeentry.h
+++ b/src/resources/skill/skilltypeentry.h
@@ -27,7 +27,7 @@
struct SkillTypeEntry final
{
- A_DELETE_COPY(SkillTypeEntry)
+ A_DEFAULT_COPY(SkillTypeEntry)
const SkillType::SkillType type;
const char *const name;