From owner-svn-ports-all@freebsd.org Mon Aug 27 21:08:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1BDC10964D3; Mon, 27 Aug 2018 21:08:26 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 987438364E; Mon, 27 Aug 2018 21:08:26 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D96023099; Mon, 27 Aug 2018 21:08:26 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7RL8QnY034036; Mon, 27 Aug 2018 21:08:26 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7RL8PNp034031; Mon, 27 Aug 2018 21:08:25 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201808272108.w7RL8PNp034031@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 27 Aug 2018 21:08:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478253 - head/lang/maude/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/lang/maude/files X-SVN-Commit-Revision: 478253 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 21:08:27 -0000 Author: tobik Date: Mon Aug 27 21:08:25 2018 New Revision: 478253 URL: https://svnweb.freebsd.org/changeset/ports/478253 Log: lang/maude: Fix build with Clang 6 ../../src/Core/termSet.hh:35:15: error: ISO C++11 does not allow access declarations; use using declarations instead PointerSet::cardinality; ^ http://beefy11.nyi.freebsd.org/data/head-i386-default/p477696_s338122/logs/errors/maude-2.6_1.log Added: head/lang/maude/files/patch-src_Core_dagNodeSet.hh (contents, props changed) head/lang/maude/files/patch-src_Core_termSet.hh (contents, props changed) head/lang/maude/files/patch-src_Meta_metaMatch.cc (contents, props changed) head/lang/maude/files/patch-src_ObjectSystem_socketStuff.cc (contents, props changed) Modified: head/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc Added: head/lang/maude/files/patch-src_Core_dagNodeSet.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/maude/files/patch-src_Core_dagNodeSet.hh Mon Aug 27 21:08:25 2018 (r478253) @@ -0,0 +1,18 @@ +./dagNodeSet.hh:35:15: error: ISO C++11 does not allow access declarations; use using + declarations instead + PointerSet::cardinality; + ^ + +--- src/Core/dagNodeSet.hh.orig 2018-08-27 20:49:56 UTC ++++ src/Core/dagNodeSet.hh +@@ -32,8 +32,8 @@ class DagNodeSet : private PointerSet + public: + int insert(DagNode* d); + int dagNode2Index(DagNode* d) const; +- PointerSet::cardinality; +- PointerSet::makeEmpty; ++ using PointerSet::cardinality; ++ using PointerSet::makeEmpty; + DagNode* index2DagNode(int i) const; + + private: Added: head/lang/maude/files/patch-src_Core_termSet.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/maude/files/patch-src_Core_termSet.hh Mon Aug 27 21:08:25 2018 (r478253) @@ -0,0 +1,19 @@ +In file included from symbol.cc:41: +In file included from ./term.hh:34: +../../src/Core/termSet.hh:35:15: error: ISO C++11 does not allow access declarations; use using declarations instead + PointerSet::cardinality; + ^ + +--- src/Core/termSet.hh.orig 2018-08-27 20:47:58 UTC ++++ src/Core/termSet.hh +@@ -32,8 +32,8 @@ class TermSet : private PointerSet + public: + void insert(Term* t); + int term2Index(Term* t) const; +- PointerSet::cardinality; +- PointerSet::makeEmpty; ++ using PointerSet::cardinality; ++ using PointerSet::makeEmpty; + + private: + unsigned int hash(void* pointer) const; Added: head/lang/maude/files/patch-src_Meta_metaMatch.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/maude/files/patch-src_Meta_metaMatch.cc Mon Aug 27 21:08:25 2018 (r478253) @@ -0,0 +1,11 @@ +--- src/Meta/metaMatch.cc.orig 2018-08-27 20:58:55 UTC ++++ src/Meta/metaMatch.cc +@@ -172,7 +172,7 @@ MetaLevelOpSymbol::makeMatchSearchState2(MetaModule* m + } + } + } +- return false; ++ return NULL; + } + + bool Added: head/lang/maude/files/patch-src_ObjectSystem_socketStuff.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/maude/files/patch-src_ObjectSystem_socketStuff.cc Mon Aug 27 21:08:25 2018 (r478253) @@ -0,0 +1,11 @@ +--- src/ObjectSystem/socketStuff.cc.orig 2018-08-27 20:56:09 UTC ++++ src/ObjectSystem/socketStuff.cc +@@ -219,7 +219,7 @@ SocketManagerSymbol::createServerTcpSocket(FreeDagNode + sockName.sin_family = AF_INET; + sockName.sin_port = htons(port); + sockName.sin_addr.s_addr = htonl(INADDR_ANY); // HACK - what is the portable way to set this? +- if (bind(fd, reinterpret_cast(&sockName), sizeof(sockName)) == -1) ++ if (::bind(fd, reinterpret_cast(&sockName), sizeof(sockName)) == -1) + { + const char* errText = strerror(errno); + DebugAdvisory("unexpected bind() error with fd " << fd << ": " << errText); Modified: head/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc ============================================================================== --- head/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc Mon Aug 27 20:38:50 2018 (r478252) +++ head/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc Mon Aug 27 21:08:25 2018 (r478253) @@ -1,11 +1,11 @@ ---- ./src/BuiltIn/stringOpSymbol.cc.orig 2014-09-03 02:36:06.000000000 +0200 -+++ ./src/BuiltIn/stringOpSymbol.cc 2014-09-03 02:32:45.000000000 +0200 -@@ -472,7 +472,7 @@ +--- src/BuiltIn/stringOpSymbol.cc.orig 2008-09-12 01:03:36 UTC ++++ src/BuiltIn/stringOpSymbol.cc +@@ -472,7 +472,7 @@ StringOpSymbol::eqRewrite(DagNode* subject, RewritingC const mpz_class& n0 = succSymbol->getNat(a0); if (n0 <= 255) { - char c = n0.get_si(); -+ char c[2] = { n0.get_si(), 0 }; ++ char c[2] = { static_cast(n0.get_si()), 0 }; return rewriteToString(subject, context, crope(c)); } }