[141218] trunk/dports/math/aamath

[jeremyhu at macports.org]

Revision: 141218
          https://trac.macports.org/changeset/141218
Author:   jeremyhu at macports.org
Date:     2015-10-12 19:40:19 -0700 (Mon, 12 Oct 2015)
Log Message:
-----------
aamath: Build with clang

Modified Paths:
--------------
    trunk/dports/math/aamath/Portfile

Added Paths:
-----------
    trunk/dports/math/aamath/files/patch-expr.h.diff

Modified: trunk/dports/math/aamath/Portfile
===================================================================
--- trunk/dports/math/aamath/Portfile	2015-10-13 01:55:51 UTC (rev 141217)
+++ trunk/dports/math/aamath/Portfile	2015-10-13 02:40:19 UTC (rev 141218)
@@ -5,7 +5,7 @@
 
 name                aamath
 version             0.3
-revision            3
+revision            4
 categories          math textproc
 platforms           darwin
 license             GPL-2
@@ -30,12 +30,7 @@
 configure.cppflags-append -I${prefix}/include/ncurses
 configure.ldflags-append -lreadline -ltermcap -lncurses
 
-# TODO: Fix this buggy C++ code which clang is correct to complain about.
-# ./expr.h:454:43: error: redefinition of parameter 'c'
-# void render_symbol(Canvas& c, int r, int c, int h) const;
-compiler.blacklist  *clang*
-
-patchfiles          patch-Makefile.diff
+patchfiles          patch-Makefile.diff patch-expr.h.diff
 post-patch {
     reinplace s|@@CXX@@|${configure.cxx}|g ${worksrcpath}/Makefile
     reinplace s|@@LDFLAGS@@|${configure.ldflags}|g ${worksrcpath}/Makefile

Added: trunk/dports/math/aamath/files/patch-expr.h.diff
===================================================================
--- trunk/dports/math/aamath/files/patch-expr.h.diff	                        (rev 0)
+++ trunk/dports/math/aamath/files/patch-expr.h.diff	2015-10-13 02:40:19 UTC (rev 141218)
@@ -0,0 +1,59 @@
+--- expr.h.orig	2015-10-12 19:34:34.000000000 -0700
++++ expr.h	2015-10-12 19:35:08.000000000 -0700
+@@ -451,7 +451,7 @@ class Integral : public OpOnFunction {
+ 
+ 	virtual CanvasPtr render_head() const;
+ 
+-	void render_symbol(Canvas& c, int r, int c, int h) const;
++	void render_symbol(Canvas& canvas, int r, int c, int h) const;
+ 
+ 	virtual CanvasPtr render() const;
+ };
+@@ -467,7 +467,7 @@ class IntegralOnInterval : public Integr
+ 
+ class OpSymbol {
+   public:
+-	virtual void render(Canvas& c, int r, int c) const = 0;
++	virtual void render(Canvas& canvas, int r, int c) const = 0;
+ };
+ 
+ class SumOrProduct : public OpOnFunction {
+--- expr.cc.orig	2005-03-07 18:00:02.000000000 -0800
++++ expr.cc	2015-10-12 19:36:23.000000000 -0700
+@@ -1192,7 +1192,7 @@ IntegralOnInterval::render_head() const
+ 
+ class SumSymbol : public OpSymbol {
+   public:
+-	void render(Canvas& c, int r, int c) const;
++	void render(Canvas& canvas, int r, int c) const;
+ };
+ 
+ void
+@@ -1208,7 +1208,7 @@ SumSymbol::render(Canvas& canvas, int r,
+ 
+ class ProductSymbol : public OpSymbol {
+   public:
+-	void render(Canvas& c, int r, int c) const;
++	void render(Canvas& canvas, int r, int c) const;
+ };
+ 
+ void
+@@ -1612,7 +1612,7 @@ Matrix::render() const
+ 	int cols = num_cols();
+ 	int rows = num_rows();
+ 
+-	CanvasPtr ec[cols * rows];
++	CanvasPtr *ec = new CanvasPtr[cols * rows];
+ 	Size sz[cols * rows];
+ 
+ 	int row_height[rows];
+@@ -1692,6 +1692,8 @@ Matrix::render() const
+ 
+ 	canvas->center();
+ 
++    delete[] ec;
++
+ 	return canvas;
+ }
+ 
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151012/01979163/attachment-0001.html>