Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 5 Feb 2017 18:57:40 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433441 - in head/math/scilab: . files
Message-ID:  <201702051857.v15IveRw021914@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Sun Feb  5 18:57:40 2017
New Revision: 433441
URL: https://svnweb.freebsd.org/changeset/ports/433441

Log:
  math/scilab: unbreak with clang 4.0
  
  src/cpp/diary_manager.cpp:64:24: error: ordered comparison between pointer and zero ('int *' and 'int')
          if (array_size > 0)
              ~~~~~~~~~~ ^ ~
  
  PR:		216214
  Submitted by:	pfg
  Approved by:	maintainer timeout (2 weeks)

Added:
  head/math/scilab/files/patch-modules_output__stream_src_cpp_diary__manager.cpp   (contents, props changed)
Modified:
  head/math/scilab/Makefile   (contents, props changed)

Modified: head/math/scilab/Makefile
==============================================================================
--- head/math/scilab/Makefile	Sun Feb  5 18:10:56 2017	(r433440)
+++ head/math/scilab/Makefile	Sun Feb  5 18:57:40 2017	(r433441)
@@ -3,7 +3,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	5.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math cad java
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}

Added: head/math/scilab/files/patch-modules_output__stream_src_cpp_diary__manager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/scilab/files/patch-modules_output__stream_src_cpp_diary__manager.cpp	Sun Feb  5 18:57:40 2017	(r433441)
@@ -0,0 +1,11 @@
+--- modules/output_stream/src/cpp/diary_manager.cpp.orig	2015-03-31 09:31:36 UTC
++++ modules/output_stream/src/cpp/diary_manager.cpp
+@@ -61,7 +61,7 @@ wchar_t **getDiaryFilenames(int *array_s
+     if (SCIDIARY)
+     {
+         std::wstring * wstringFilenames = SCIDIARY->getFilenames(array_size);
+-        if (array_size > 0)
++        if (*array_size > 0)
+         {
+             wchar_t **wcFilenames = (wchar_t **) MALLOC (sizeof(wchar_t*) * (*array_size));
+             for (int i = 0; i < *array_size; i++)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702051857.v15IveRw021914>