nsgml: Resolve symbol collision when building with SunStudio 12.1

diff --git a/cde/programs/nsgmls/Ptr.h b/cde/programs/nsgmls/Ptr.h
index d8f2970aa8685c34467211c3ec46c685f176ab10..24baf06364bfb752086baad4a0598c62bbddc668 100644 (file)
--- a/cde/programs/nsgmls/Ptr.h
+++ b/cde/programs/nsgmls/Ptr.h
@@ -93,7 +93,14 @@ public:
   const T &operator*() const { return *Ptr<T>::pointer(); }
   void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
   using Ptr<T>::isNull;
+
+#if defined(__SUNPRO_CC) && __SUNPRO_CC == 0x5100
+  /* Needed to avoid symbol export collision */
+  void clear() { Ptr<T>::clear(); }
+#else
   using Ptr<T>::clear;
+#endif
+
   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 {