diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/utils | |
parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
download | manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/base64.cpp | 2 | ||||
-rw-r--r-- | src/utils/copynpaste.cpp | 2 | ||||
-rw-r--r-- | src/utils/xml.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index 3906efc76..1ea75322b 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -155,7 +155,7 @@ unsigned char *php3_base64_decode(const unsigned char *string, case 0: case 1: free(result); - return 0; + return nullptr; case 2: k++; case 3: diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 7bf7e59d4..98b98fbe9 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -431,7 +431,7 @@ bool sendBuffer(std::string& text) } close(fd[0]); } - execl("/usr/bin/xsel", "xsel", "-i", (char *)0); + execl("/usr/bin/xsel", "xsel", "-i", (char *)nullptr); exit(1); } diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 56aa44ce3..10436067f 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -35,7 +35,7 @@ namespace XML { Document::Document(const std::string &filename, bool useResman): - mDoc(0) + mDoc(nullptr) { int size; char *data = nullptr; @@ -87,7 +87,7 @@ namespace XML if (data) mDoc = xmlParseMemory(data, size); else - mDoc = 0; + mDoc = nullptr; } Document::~Document() @@ -98,7 +98,7 @@ namespace XML xmlNodePtr Document::rootNode() { - return mDoc ? xmlDocGetRootElement(mDoc) : 0; + return mDoc ? xmlDocGetRootElement(mDoc) : nullptr; } int getProperty(xmlNodePtr node, const char* name, int def) |