summaryrefslogtreecommitdiff
path: root/src/configuration.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-21 01:26:07 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-21 01:26:07 +0300
commit98dabed4de60bc86522632379f2499aecbae2b70 (patch)
tree48924b90447eb513f330c1e82d9afbab3719525e /src/configuration.h
parentec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (diff)
downloadManaVerse-98dabed4de60bc86522632379f2499aecbae2b70.tar.gz
ManaVerse-98dabed4de60bc86522632379f2499aecbae2b70.tar.bz2
ManaVerse-98dabed4de60bc86522632379f2499aecbae2b70.tar.xz
ManaVerse-98dabed4de60bc86522632379f2499aecbae2b70.zip
Fix compilation errors and warnings for another gcc 4.7 snapshot.
Diffstat (limited to 'src/configuration.h')
-rw-r--r--src/configuration.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/configuration.h b/src/configuration.h
index 2a84588f6..00479933e 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -27,7 +27,7 @@
#include "utils/xml.h"
#include "defaults.h"
-
+#include "localconsts.h"
#include <cassert>
#include <list>
@@ -159,7 +159,7 @@ class ConfigurationObject
}
delete nextobj;
- nextobj = 0;
+ nextobj = nullptr;
}
/**