From: Jon Trulson Date: Sun, 9 Mar 2014 20:24:00 +0000 (-0600) Subject: nsgmls: fix up some gcc 4.8 warnings. X-Git-Tag: 2.2.2~61 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0394dde3f923b5224d1c928e00d93eb1229ad213;p=oweals%2Fcde.git nsgmls: fix up some gcc 4.8 warnings. --- diff --git a/cde/programs/nsgmls/IList.h b/cde/programs/nsgmls/IList.h index 75cf5348..fcf68b21 100644 --- a/cde/programs/nsgmls/IList.h +++ b/cde/programs/nsgmls/IList.h @@ -49,8 +49,8 @@ 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 &) {} diff --git a/cde/programs/nsgmls/IListIter.h b/cde/programs/nsgmls/IListIter.h index 7c28c614..0d6d0e1d 100644 --- a/cde/programs/nsgmls/IListIter.h +++ b/cde/programs/nsgmls/IListIter.h @@ -40,8 +40,8 @@ public: IListIter(const IList &list) : IListIterBase(list) { } T *cur() { return (T *)IListIterBase::cur(); } - IListIterBase::next; - IListIterBase::done; + using IListIterBase::next; + using IListIterBase::done; }; #ifdef SP_NAMESPACE diff --git a/cde/programs/nsgmls/Parser.h b/cde/programs/nsgmls/Parser.h index e8452efd..9729931a 100644 --- a/cde/programs/nsgmls/Parser.h +++ b/cde/programs/nsgmls/Parser.h @@ -85,15 +85,15 @@ public: Parser(const SgmlParser::Params &); Event *nextEvent(); void parseAll(EventHandler &, SP_CONST SP_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 diff --git a/cde/programs/nsgmls/Ptr.h b/cde/programs/nsgmls/Ptr.h index a346e08e..1415c914 100644 --- a/cde/programs/nsgmls/Ptr.h +++ b/cde/programs/nsgmls/Ptr.h @@ -99,8 +99,8 @@ 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 {