external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

nsgml: Resolve symbol collision when building with SunStudio 12.1

Browse source
This commit is contained in:
Matthew R. Trower 2018-06-13 22:16:14 -05:00 • committed by Jon Trulson
parent 55b4e2f240
commit 6715300820
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cde/programs/nsgmls/Ptr.h
View file

@ -93,7 +93,14 @@ 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); } void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
using Ptr<T>::isNull; 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; 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 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 { Boolean operator==(const ConstPtr<T> &p) const {