diff options
Diffstat (limited to 'games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch')
-rw-r--r-- | games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch b/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch new file mode 100644 index 000000000000..e3cba2741405 --- /dev/null +++ b/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch @@ -0,0 +1,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);
|