svn commit: r458643 - head/textproc/jade/files
Jan Beich
jbeich at FreeBSD.org
Wed Jan 10 14:17:15 UTC 2018
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<T>::isNull;
^
using
./../include/Ptr.h:74:11: error: ISO C++11 does not allow access declarations; use using declarations
instead
Ptr<T>::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<T> { (public)
+ const T *operator->() const { return Ptr<T>::pointer(); }
+ const T &operator*() const { return *Ptr<T>::pointer(); }
+ void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
+- Ptr<T>::isNull;
+- Ptr<T>::clear;
++ using Ptr<T>::isNull;
++ using Ptr<T>::clear;
+ Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
+ Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
+ Boolean operator==(const ConstPtr<T> &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<T> &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<T>;
+ private:
+ IList(const IList<T> &); // 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<T> &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
More information about the svn-ports-head
mailing list