From 0394dde3f923b5224d1c928e00d93eb1229ad213 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sun, 9 Mar 2014 14:24:00 -0600
Subject: [PATCH] nsgmls: fix up some gcc 4.8 warnings.

---
 cde/programs/nsgmls/IList.h     |  4 ++--
 cde/programs/nsgmls/IListIter.h |  4 ++--
 cde/programs/nsgmls/Parser.h    | 18 +++++++++---------
 cde/programs/nsgmls/Ptr.h       |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

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<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> &) {}
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<T> &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<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 {
-- 
2.25.1