From: Matthew R. Trower <dev@blackshard.net>
Date: Thu, 14 Jun 2018 03:16:14 +0000 (-0500)
Subject: nsgml: Resolve symbol collision when building with SunStudio 12.1
X-Git-Tag: 2.3.0~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=671530082004aa880b3a0bfb7108bc30c6d97fab;p=oweals%2Fcde.git

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 d8f2970a..24baf063 100644
--- 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 {