@@ -, +, @@ instead Ptr::isNull; ^ using instead Ptr::clear; ^ using declarations instead IListBase::clear; ^ using declarations instead IListBase::empty; ^ using declarations instead IListIterBase::next; ^ using declarations instead IListIterBase::done; ^ 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; ^ using --- textproc/jade/files/patch-Ptr.h | 11 +++++++++++ textproc/jade/files/patch-include_IList.h | 13 +++++++++++++ textproc/jade/files/patch-include_IListIter.h | 13 +++++++++++++ textproc/jade/files/patch-lib_Parser.h | 27 +++++++++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 textproc/jade/files/patch-include_IList.h create mode 100644 textproc/jade/files/patch-include_IListIter.h create mode 100644 textproc/jade/files/patch-lib_Parser.h --- b/textproc/jade/files/patch-Ptr.h +++ b/textproc/jade/files/patch-Ptr.h @@ -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 { --- /dev/null +++ b/textproc/jade/files/patch-include_IList.h @@ -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 --- /dev/null +++ b/textproc/jade/files/patch-include_IListIter.h @@ -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 --- /dev/null +++ b/textproc/jade/files/patch-lib_Parser.h @@ -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