Date: Mon, 13 Apr 2015 19:18:37 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383950 - in head/math/gambit: . files Message-ID: <201504131918.t3DJIb0E063040@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Apr 13 19:18:36 2015 New Revision: 383950 URL: https://svnweb.freebsd.org/changeset/ports/383950 Log: Fix build with c++11 Added: head/math/gambit/files/patch-src_libgambit_matrix.cc (contents, props changed) head/math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc (contents, props changed) Modified: head/math/gambit/Makefile Modified: head/math/gambit/Makefile ============================================================================== --- head/math/gambit/Makefile Mon Apr 13 19:08:47 2015 (r383949) +++ head/math/gambit/Makefile Mon Apr 13 19:18:36 2015 (r383950) @@ -10,6 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library of tools for doing computation in game theory LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lib USE_GNOME= gtk20 Added: head/math/gambit/files/patch-src_libgambit_matrix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/gambit/files/patch-src_libgambit_matrix.cc Mon Apr 13 19:18:36 2015 (r383950) @@ -0,0 +1,18 @@ +--- src/libgambit/matrix.cc.orig 2014-06-06 16:33:54.000000000 +0400 ++++ src/libgambit/matrix.cc 2015-04-13 21:39:08.802909000 +0300 +@@ -25,11 +25,15 @@ + + using namespace Gambit; + ++namespace Gambit { ++ + template class Matrix<double>; + template class Matrix<Rational>; + template class Matrix<Integer>; + template class Matrix<int>; + ++} ++ + template Vector<double> Gambit::operator*(const Vector<double> &, + const Matrix<double> &); + template Vector<Rational> Gambit::operator*(const Vector<Rational> &, Added: head/math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc Mon Apr 13 19:18:36 2015 (r383950) @@ -0,0 +1,29 @@ +--- src/tools/enumpoly/pelqhull.cc.orig 2014-05-27 12:07:04.000000000 +0400 ++++ src/tools/enumpoly/pelqhull.cc 2015-04-13 20:35:03.596285000 +0300 +@@ -2792,7 +2792,7 @@ + + /* zdef_(type,name,doc,average) */ + zzdef_(zdoc, Zdoc2, "precision statistics", -1); +- zdef_(zinc, Znewvertex, reinterpret_cast<const char *>(NULL), -1); ++ zdef_(zinc, Znewvertex, static_cast<const char *>(NULL), -1); + zdef_(wadd, Wnewvertex, "ave. distance of a new vertex to a facet (not 0s)", Znewvertex); + zdef_(wmax, Wnewvertexmax, "max. distance of a new vertex to a facet", -1); + zdef_(wmax, Wvertexmax, "max. distance of an output vertex to a facet", -1); +@@ -2831,7 +2831,7 @@ + zzdef_(zinc, Zsetplane, "facets created altogether", -1); + zdef_(zinc, Ztotridges, "ridges created altogether", -1); + zdef_(zinc, Zpostfacets, "facets before post merge", -1); +- zdef_(zinc, Zangle, reinterpret_cast<const char *>(NULL), -1); ++ zdef_(zinc, Zangle, static_cast<const char *>(NULL), -1); + zdef_(wadd, Wangle, "average angle (cosine) for all ridges", Zangle); + zdef_(wmax, Wanglemax, "maximum angle (cosine) of a ridge", -1); + zdef_(wmin, Wanglemin, "minimum angle (cosine) of a ridge", -1); +@@ -2946,7 +2946,7 @@ + zdef_(zinc, Zintersect, "intersections found redundant vertices", -1); + zdef_(zadd, Zintersecttot, " ave. number found per vertex", Zintersect); + zdef_(zmax, Zintersectmax, " max. found for a vertex", -1); +- zdef_(zinc, Zvertexridge, reinterpret_cast<const char *>(NULL), -1); ++ zdef_(zinc, Zvertexridge, static_cast<const char *>(NULL), -1); + zdef_(zadd, Zvertexridgetot, " ave. number of ridges per tested vertex", Zvertexridge); + zdef_(zmax, Zvertexridgemax, " max. number of ridges per tested vertex", -1); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504131918.t3DJIb0E063040>