blob: e3cba27414052970170166b3653a2c5e6414cec3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
In C++14, bool -> T* implicit conversions are not allowed anymore.
See also: https://bugs.gentoo.org/show_bug.cgi?id=601890
--- a/src/common/weapons/AccessoryStore.cpp
+++ b/src/common/weapons/AccessoryStore.cpp
@@ -156,7 +156,7 @@
Accessory *parent, XMLNode *currentNode)
{
XMLNode *typeNode = 0;
- if (!currentNode->getNamedParameter("type", typeNode)) return false;
+ if (!currentNode->getNamedParameter("type", typeNode)) return NULL;
AccessoryPart *accessoryPart =
AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);
|
GitWeb
