summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-04-30 21:23:37 +0300
committerAndrei Karas <akaras@inbox.ru>2014-04-30 21:23:37 +0300
commit1b553860436238f44a5dd781187ea6361002fcf0 (patch)
tree34241dc8e212d69aa78c8b7642c3fefa9315cb11
parentef7e7319305f040a47c483b71f2e78da7a1d6149 (diff)
downloadplus-1b553860436238f44a5dd781187ea6361002fcf0.tar.gz
plus-1b553860436238f44a5dd781187ea6361002fcf0.tar.bz2
plus-1b553860436238f44a5dd781187ea6361002fcf0.tar.xz
plus-1b553860436238f44a5dd781187ea6361002fcf0.zip
Fix compilation with old gcc and clang.
-rw-r--r--src/gui/setupactiondata.h2
-rw-r--r--src/localconsts.h2
-rw-r--r--src/notifications.h2
-rw-r--r--src/resources/db/itemdb.cpp10
4 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index b27aa5483..94a16668f 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -33,6 +33,7 @@
struct SetupActionData final
{
+#ifdef ADVGCC
SetupActionData(const std::string name0,
const int actionId0,
const std::string text0) :
@@ -42,6 +43,7 @@ struct SetupActionData final
{ }
A_DELETE_COPY(SetupActionData)
+#endif
std::string name;
const int actionId;
diff --git a/src/localconsts.h b/src/localconsts.h
index 298877b6b..35ccf1f78 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -53,6 +53,8 @@
#define noexcept
// #define A_DELETE
// #define A_DELETE_COPY
+#else
+#define ADVGCC
#endif
#undef Z_NULL
#define Z_NULL nullptr
diff --git a/src/notifications.h b/src/notifications.h
index 0c08c0430..925e634de 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -41,6 +41,7 @@ namespace NotifyManager
struct NotificationInfo final
{
+#ifdef ADVGCC
NotificationInfo(const char *const sound0,
const char *const text0,
const NotifyFlags flags0) :
@@ -50,6 +51,7 @@ namespace NotifyManager
{ }
A_DELETE_COPY(NotificationInfo)
+#endif
const char *sound;
const char *text;
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 939568f29..7d61fedbf 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -67,14 +67,7 @@ namespace
{
struct FieldType
{
-/*
- FieldType() :
- name(nullptr),
- description(nullptr),
- sign(false)
- { }
-*/
-
+#ifdef ADVGCC
FieldType(const char *const name0,
const char *const description0,
const bool sign0) :
@@ -84,6 +77,7 @@ namespace
{ }
A_DELETE_COPY(FieldType)
+#endif
const char *name;
const char *description;