nsgmls: fix up some gcc 4.8 warnings.
authorJon Trulson <jon@radscan.com>
Sun, 9 Mar 2014 20:24:00 +0000 (14:24 -0600)
committerJon Trulson <jon@radscan.com>
Sun, 9 Mar 2014 20:24:00 +0000 (14:24 -0600)
cde/programs/nsgmls/IList.h
cde/programs/nsgmls/IListIter.h
cde/programs/nsgmls/Parser.h
cde/programs/nsgmls/Ptr.h

index 75cf53486b99cad7957b5150fa45aa35be6a7d08..fcf68b21a5e48c708383b59b46569d3974a7323f 100644 (file)
@@ -49,8 +49,8 @@ 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> &) {}
index 7c28c614157cb2322b2aaf79b0de13134f9f7886..0d6d0e1d771c347f2689e41c338271dfc5c61a19 100644 (file)
@@ -40,8 +40,8 @@ public:
   IListIter(const IList<T> &list) : IListIterBase(list) { }
   T *cur() { return (T *)IListIterBase::cur(); }
   
-  IListIterBase::next;
-  IListIterBase::done;
+  using IListIterBase::next;
+  using IListIterBase::done;
 };
 
 #ifdef SP_NAMESPACE
index e8452efd098a743a9689d78d96924abe1fe46fef..9729931ac4a70c095ced02c41586108b19597093 100644 (file)
@@ -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
index a346e08e249fed250ea031e9a9ece7247dd32bff..1415c9141fa96e16f077179f708b7179a43e68c5 100644 (file)
@@ -99,8 +99,8 @@ 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 {