svn commit: r432971 - head/editors/madedit/files

Jan Beich jbeich at FreeBSD.org
Wed Feb 1 05:25:43 UTC 2017


Author: jbeich
Date: Wed Feb  1 05:25:42 2017
New Revision: 432971
URL: https://svnweb.freebsd.org/changeset/ports/432971

Log:
  editors/madedit: unbreak with clang 4.0
  
  src/MadOptionsDialog.cpp:1179:56: error: ordered comparison between pointer and zero
        ('const wxChar *' (aka 'const wchar_t *') and 'int')
          if(g_SelectedCommandItem->cmddata->menuid_name > 0)
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
  src/MadOptionsDialog.cpp:1277:42: error: ordered comparison between pointer and zero
        ('const wxChar *' (aka 'const wchar_t *') and 'int')
              if(tid->cmddata->menuid_name > 0)
                 ~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
  
  PR:		216076
  Reported by:	antoine (via exp-run)

Added:
  head/editors/madedit/files/patch-src_MadOptionsDialog.cpp   (contents, props changed)

Added: head/editors/madedit/files/patch-src_MadOptionsDialog.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/madedit/files/patch-src_MadOptionsDialog.cpp	Wed Feb  1 05:25:42 2017	(r432971)
@@ -0,0 +1,20 @@
+--- src/MadOptionsDialog.cpp.orig	2017-02-01 03:37:19 UTC
++++ src/MadOptionsDialog.cpp
+@@ -1176,7 +1176,7 @@ void MadOptionsDialog::WxTreeCtrl1SelCha
+     {
+         WxListBoxKeys->Set(g_SelectedCommandItem->keys);
+         wxString hint=wxT('[');
+-        if(g_SelectedCommandItem->cmddata->menuid_name > 0)
++        if(g_SelectedCommandItem->cmddata->menuid_name)
+         {
+             hint+= wxString(g_SelectedCommandItem->cmddata->menuid_name);
+         }
+@@ -1274,7 +1274,7 @@ void MadOptionsDialog::UpdateKeyHint()
+             g_CommandItemOfNewKey=tid;
+             wxString cmd;
+ 
+-            if(tid->cmddata->menuid_name > 0)
++            if(tid->cmddata->menuid_name)
+             {
+                 cmd+= wxString(tid->cmddata->menuid_name);
+             }


More information about the svn-ports-head mailing list