svn commit: r354358 - in head/math/octave-forge-miscellaneous: . files

[Tijl Coosemans]

On Sat, 17 May 2014 19:34:49 +0000 (UTC) Stephen Montgomery-Smith wrote:
> Author: stephen
> Date: Sat May 17 19:34:49 2014
> New Revision: 354358
> URL: http://svnweb.freebsd.org/changeset/ports/354358
> QAT: https://qat.redports.org/buildarchive/r354358/
> 
> Log:
>   - Make clang compliant.
>   - Bump portrevision.
> 
> Added:
>   head/math/octave-forge-miscellaneous/files/
>   head/math/octave-forge-miscellaneous/files/patch-partarray.cc   (contents, props changed)
> Modified:
>   head/math/octave-forge-miscellaneous/Makefile
> 
> Modified: head/math/octave-forge-miscellaneous/Makefile
> ==============================================================================
> --- head/math/octave-forge-miscellaneous/Makefile	Sat May 17 19:34:08 2014	(r354357)
> +++ head/math/octave-forge-miscellaneous/Makefile	Sat May 17 19:34:49 2014	(r354358)
> @@ -3,7 +3,7 @@
>  
>  PORTNAME=	octave-forge-miscellaneous
>  PORTVERSION=	1.2.0
> -PORTREVISION=	3
> +PORTREVISION=	4
>  CATEGORIES=	math
>  
>  MAINTAINER=	stephen at FreeBSD.org
> 
> Added: head/math/octave-forge-miscellaneous/files/patch-partarray.cc
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/math/octave-forge-miscellaneous/files/patch-partarray.cc	Sat May 17 19:34:49 2014	(r354358)
> @@ -0,0 +1,47 @@
> +--- partarray.cc.orig	2012-03-24 14:53:23.000000000 -0500
> ++++ partarray.cc	2014-05-17 13:05:40.000000000 -0500
> +@@ -39,9 +39,12 @@
> +   Array<int> nidx (dim_vector (maxdims, 1));
> +   // Octave-3.2.4 reports "missing symbol" with Array<Array< > >,
> +   // though 3.3.54+ does not
> +-  Array<octave_idx_type> bidc [maxdims], eidc [maxdims];
> +   //
> +   Array<octave_idx_type> step (dim_vector (maxdims, 1));
> ++  // Array<octave_idx_type> bidc [maxdims], eidc [maxdims];
> ++  Array<octave_idx_type> *bidc, *eidc;
> ++  bidc = new Array<octave_idx_type> [maxdims];
> ++  eidc = new Array<octave_idx_type> [maxdims];
> +   step(0) = 1;
> +   for (int i = 0; i < maxdims; i++)
> +     {
> +@@ -62,6 +65,8 @@
> +             {
> +               error ("%s: argument %i: wrong dimensions",
> +                      fname.c_str (), i + 2);
> ++              delete(bidc);
> ++              delete(eidc);
> +               return Cell ();
> +             }
> +           cnidx =
> +@@ -83,8 +88,11 @@
> +       if (i < maxdims - 1)
> +         step(i + 1) = step(i) * alldims(i);
> +     }
> +-  if (error_state)
> ++  if (error_state) {
> ++    delete(bidc);
> ++    delete(eidc);
> +     return Cell ();
> ++  }
> + 
> +   dim_vector rdv (nc, 1);
> + 
> +@@ -144,6 +152,8 @@
> +           }
> +     }
> + 
> ++  delete(bidc);
> ++  delete(eidc);
> +   return retval;
> + }
> + 
> 

I'm no C++ expert but I think you need to use "delete[]" instead of
"delete".