Attachment 186471 Details for Bug 222403 – Correct NULL comparison and implicit conversions

[patch] Correct NULL comparison and implicit conversions

0003-games-enigma-Patch-assumptions-which-break-C-11-buil.patch (text/plain), 2.00 KB, created by Roger Leigh on 2017-09-17 14:14:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roger Leigh

Created: 2017-09-17 14:14:14 UTC

Size: 2.00 KB

patch

obsolete

>From 50df2064f46b1cf83772e0d7fd898b06bfb4a7d4 Mon Sep 17 00:00:00 2001
>From: Roger Leigh <rleigh@codelibre.net>
>Date: Wed, 6 Sep 2017 21:42:57 +0100
>Subject: [PATCH 03/13] games/enigma: Patch assumptions which break C++11
> builds
>
>---
> games/enigma/files/patch-src_Value.cc     | 15 +++++++++++++++
> games/enigma/files/patch-src_lev_Proxy.cc | 11 +++++++++++
> 2 files changed, 26 insertions(+)
> create mode 100644 games/enigma/files/patch-src_Value.cc
> create mode 100644 games/enigma/files/patch-src_lev_Proxy.cc
>
>diff --git a/games/enigma/files/patch-src_Value.cc b/games/enigma/files/patch-src_Value.cc
>new file mode 100644
>index 000000000000..885c8f0c78fc
>--- /dev/null
>+++ b/games/enigma/files/patch-src_Value.cc
>@@ -0,0 +1,15 @@
>+--- src/Value.cc.orig	2017-09-03 15:39:37 UTC
>++++ src/Value.cc
>+@@ -146,10 +146,10 @@ namespace enigma {
>+                 val.str[0] = 0;
>+                 break;
>+             case BOOL :
>+-                val.dval[0] = false;
>++                val.dval[0] = 0;
>+                 break;
>+             case OBJECT :
>+-                val.dval[0] = (double) NULL;
>++                val.dval[0] = 0;
>+                 break;
>+             case NAMEDOBJECT:
>+                 ASSERT(false, XLevelRuntime, "Value: illegal type usage");
>diff --git a/games/enigma/files/patch-src_lev_Proxy.cc b/games/enigma/files/patch-src_lev_Proxy.cc
>new file mode 100644
>index 000000000000..4ba1676e9f75
>--- /dev/null
>+++ b/games/enigma/files/patch-src_lev_Proxy.cc
>@@ -0,0 +1,11 @@
>+--- src/lev/Proxy.cc.orig	2017-09-03 15:54:50 UTC
>++++ src/lev/Proxy.cc
>+@@ -933,7 +933,7 @@ namespace enigma { namespace lev {
>+                     } else if (haveLocalCopy) {
>+                         // plain file
>+                         basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in);
>+-                        if (ifs != NULL)
>++                        if (ifs)
>+                             Readfile(ifs, extCode);
>+                         else
>+                             haveLocalCopy = false;
>-- 
>2.14.1
>

Actions: View | Diff

Attachments on bug 222403: 186471