svn commit: r478253 - head/lang/maude/files

[Tobias Kortkamp]

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<sockaddr*>(&sockName), sizeof(sockName)) == -1)
++	if (::bind(fd, reinterpret_cast<sockaddr*>(&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<char>(n0.get_si()), 0 };
  		    return rewriteToString(subject, context, crope(c));
  		  }
  	      }