d...@blackshard.net (Matthew R. Trower) writes:
> Here's a potential patch which solves this issue for me. It should, in
> my estimation, be functionally equivalent. Though, I'm still curious as
> to whether Ulrich gets a clean build without it, and if so, why.
>
> Thoughts?
Heck, even better.... here's a one-liner that's obviously equivalent.
I'm going to stop working on this for now, and wait for feedback.
-- Matthew R. Trower
>From 1cf993356e3021067ef0525223f8e9a43c782aee Mon Sep 17 00:00:00 2001
From: "Matthew R. Trower" <d...@blackshard.net>
Date: Sun, 10 Jun 2018 21:39:42 -0500
Subject: [PATCH] nsgml: Resolve symbol collision when building with SunStudio
---
cde/programs/nsgmls/Ptr.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cde/programs/nsgmls/Ptr.h b/cde/programs/nsgmls/Ptr.h
index d8f2970a..3e100d95 100644
--- a/cde/programs/nsgmls/Ptr.h
+++ b/cde/programs/nsgmls/Ptr.h
@@ -93,7 +93,7 @@ public:
const T &operator*() const { return *Ptr<T>::pointer(); }
void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
using Ptr<T>::isNull;
- using Ptr<T>::clear;
+ void clear() { 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.16.2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
