From owner-svn-ports-all@freebsd.org Wed Jan 10 14:17:15 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CEC8E5B259; Wed, 10 Jan 2018 14:17:15 +0000 (UTC) (envelope-from jbeich@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 F2AF976CE7; Wed, 10 Jan 2018 14:17:14 +0000 (UTC) (envelope-from jbeich@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 1AAE826A61; Wed, 10 Jan 2018 14:17:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0AEHDeS037816; Wed, 10 Jan 2018 14:17:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0AEHDcQ037812; Wed, 10 Jan 2018 14:17:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801101417.w0AEHDcQ037812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 10 Jan 2018 14:17:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458643 - head/textproc/jade/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/textproc/jade/files X-SVN-Commit-Revision: 458643 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.25 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: Wed, 10 Jan 2018 14:17:15 -0000 Author: jbeich Date: Wed Jan 10 14:17:13 2018 New Revision: 458643 URL: https://svnweb.freebsd.org/changeset/ports/458643 Log: textproc/jade: unbreak build with Clang 6 (C++14 by default) In file included from EntityCatalog.cxx:9: In file included from ./../include/EntityDecl.h:12: ./../include/Ptr.h:73:11: error: ISO C++11 does not allow access declarations; use using declarations instead Ptr::isNull; ^ using ./../include/Ptr.h:74:11: error: ISO C++11 does not allow access declarations; use using declarations instead Ptr::clear; ^ using In file included from DescriptorManager.cxx:5: In file included from ./../include/DescriptorManager.h:8: In file included from ./../include/List.h:7: ./../include/IList.h:29:14: error: ISO C++11 does not allow access declarations; use using declarations instead IListBase::clear; ^ using ./../include/IList.h:30:14: error: ISO C++11 does not allow access declarations; use using declarations instead IListBase::empty; ^ using In file included from DescriptorManager.cxx:6: In file included from ./../include/ListIter.h:8: ./../include/IListIter.h:20:18: error: ISO C++11 does not allow access declarations; use using declarations instead IListIterBase::next; ^ using ./../include/IListIter.h:21:18: error: ISO C++11 does not allow access declarations; use using declarations instead IListIterBase::done; ^ using In file included from parseSd.cxx:5: ./Parser.h:65:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::sdPointer; ^ using ./Parser.h:66:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::instanceSyntaxPointer; ^ using ./Parser.h:67:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::prologSyntaxPointer; ^ using ./Parser.h:68:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::activateLinkType; ^ using ./Parser.h:69:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::allLinkTypesActivated; ^ using ./Parser.h:70:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::entityManager; ^ using ./Parser.h:71:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::entityCatalog; ^ using ./Parser.h:72:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::baseDtd; ^ using ./Parser.h:73:16: error: ISO C++11 does not allow access declarations; use using declarations instead ParserState::options; ^ using PR: 224929 Reported by: antoine (via bug 224669) Reviewed by: dim Approved by: portmgr blanket Added: head/textproc/jade/files/patch-include_IList.h (contents, props changed) head/textproc/jade/files/patch-include_IListIter.h (contents, props changed) head/textproc/jade/files/patch-lib_Parser.h (contents, props changed) Modified: head/textproc/jade/files/patch-Ptr.h (contents, props changed) Modified: head/textproc/jade/files/patch-Ptr.h ============================================================================== --- head/textproc/jade/files/patch-Ptr.h Wed Jan 10 14:09:52 2018 (r458642) +++ head/textproc/jade/files/patch-Ptr.h Wed Jan 10 14:17:13 2018 (r458643) @@ -8,3 +8,14 @@ // T must have Resource as a public base class // T may be an incomplete type +@@ -69,8 +70,8 @@ class ConstPtr : private Ptr { (public) + const T *operator->() const { return Ptr::pointer(); } + const T &operator*() const { return *Ptr::pointer(); } + void swap(ConstPtr &p) { Ptr::swap(p); } +- Ptr::isNull; +- Ptr::clear; ++ using Ptr::isNull; ++ using Ptr::clear; + Boolean operator==(const Ptr &p) const { return Ptr::operator==(p); } + Boolean operator!=(const Ptr &p) const { return Ptr::operator!=(p); } + Boolean operator==(const ConstPtr &p) const { Added: head/textproc/jade/files/patch-include_IList.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/jade/files/patch-include_IList.h Wed Jan 10 14:17:13 2018 (r458643) @@ -0,0 +1,13 @@ +--- include/IList.h.orig 1998-10-07 05:15:50 UTC ++++ include/IList.h +@@ -26,8 +26,8 @@ class IList : private IListBase { (public) + void swap(IList &list) { IListBase::swap(list); } + T *head() const { return (T *)IListBase::head(); } + T *get() { return (T *)IListBase::get(); } +- IListBase::clear; +- IListBase::empty; ++ using IListBase::clear; ++ using IListBase::empty; + friend class IListIter; + private: + IList(const IList &); // undefined Added: head/textproc/jade/files/patch-include_IListIter.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/jade/files/patch-include_IListIter.h Wed Jan 10 14:17:13 2018 (r458643) @@ -0,0 +1,13 @@ +--- include/IListIter.h.orig 1998-10-07 05:15:50 UTC ++++ include/IListIter.h +@@ -17,8 +17,8 @@ class IListIter : private IListIterBase { (public) + IListIter(const IList &list) : IListIterBase(list) { } + T *cur() const { return (T *)IListIterBase::cur(); } + +- IListIterBase::next; +- IListIterBase::done; ++ using IListIterBase::next; ++ using IListIterBase::done; + }; + + #ifdef SP_NAMESPACE Added: head/textproc/jade/files/patch-lib_Parser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/jade/files/patch-lib_Parser.h Wed Jan 10 14:17:13 2018 (r458643) @@ -0,0 +1,27 @@ +--- lib/Parser.h~ 1998-10-01 05:13:28 UTC ++++ lib/Parser.h +@@ -62,15 +62,15 @@ class Parser : private ParserState { (public) + Parser(const SgmlParser::Params &); + Event *nextEvent(); + void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr); +- ParserState::sdPointer; +- ParserState::instanceSyntaxPointer; +- ParserState::prologSyntaxPointer; +- ParserState::activateLinkType; +- ParserState::allLinkTypesActivated; +- ParserState::entityManager; +- ParserState::entityCatalog; +- ParserState::baseDtd; +- ParserState::options; ++ using ParserState::sdPointer; ++ using ParserState::instanceSyntaxPointer; ++ using ParserState::prologSyntaxPointer; ++ using ParserState::activateLinkType; ++ using ParserState::allLinkTypesActivated; ++ using ParserState::entityManager; ++ using ParserState::entityCatalog; ++ using ParserState::baseDtd; ++ using ParserState::options; + private: + Parser(const Parser &); // undefined + void operator=(const Parser &); // undefined