Attachment 186460 Details for Bug 222394 – Fix C++11 build error (2)

[patch] Fix C++11 build error (2)

0008-graphics-cegui-Patch-invalid-pointer-and-integer-com.patch (text/plain), 1.34 KB, created by Roger Leigh on 2017-09-17 12:28:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roger Leigh

Created: 2017-09-17 12:28:36 UTC

Size: 1.34 KB

patch

obsolete

>From 0d0c7561a111ea8f42033b1791d08484939e66d9 Mon Sep 17 00:00:00 2001
>From: Roger Leigh <rleigh@codelibre.net>
>Date: Mon, 4 Sep 2017 09:48:42 +0100
>Subject: [PATCH 08/13] graphics/cegui: Patch invalid pointer and integer
> comparison
>
>---
> .../patch-cegui_src_XMLParserModules_TinyXML_XMLParser.cpp    | 11 +++++++++++
> 1 file changed, 11 insertions(+)
> create mode 100644 graphics/cegui/files/patch-cegui_src_XMLParserModules_TinyXML_XMLParser.cpp
>
>diff --git a/graphics/cegui/files/patch-cegui_src_XMLParserModules_TinyXML_XMLParser.cpp b/graphics/cegui/files/patch-cegui_src_XMLParserModules_TinyXML_XMLParser.cpp
>new file mode 100644
>index 000000000000..0000f7399584
>--- /dev/null
>+++ b/graphics/cegui/files/patch-cegui_src_XMLParserModules_TinyXML_XMLParser.cpp
>@@ -0,0 +1,11 @@
>+--- cegui/src/XMLParserModules/TinyXML/XMLParser.cpp.orig	2017-09-04 09:38:57.918728000 +0100
>++++ cegui/src/XMLParserModules/TinyXML/XMLParser.cpp	2017-09-04 09:40:24.424412000 +0100
>+@@ -130,7 +130,7 @@
>+                 processElement(childNode->ToElement());
>+                 break;
>+             case TiXmlNode::CEGUI_TINYXML_TEXT:
>+-                if (childNode->ToText()->Value() != '\0')
>++                if (childNode->ToText()->Value() != nullptr)
>+                     d_handler->text((encoded_char*)childNode->ToText()->Value());
>+                 break;
>+ 
>-- 
>2.14.1
>

Actions: View | Diff

Attachments on bug 222394: 186459 | 186460