From 9853d34f27b5b0eed29d28cfba326ddd9b35ea6e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 15 Jan 2022 19:52:28 +0100 Subject: [PATCH] oset-c++: Avoid compilation error with nvc++ 22.1. * lib/gl_oset.hh: With EDG C++ compilers, avoid 'friend'. --- ChangeLog | 5 +++++ lib/gl_oset.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d49794f433..0eef9f4c9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2022-01-15 Bruno Haible + + oset-c++: Avoid compilation error with nvc++ 22.1. + * lib/gl_oset.hh: With EDG C++ compilers, avoid 'friend'. + 2022-01-14 Paul Eggert nstrftime: pacify nvc 22.1 unreachable statement diff --git a/lib/gl_oset.hh b/lib/gl_oset.hh index d1bb4893f6..4fae4eb4d6 100644 --- a/lib/gl_oset.hh +++ b/lib/gl_oset.hh @@ -153,7 +153,7 @@ public: ~iterator () { gl_oset_iterator_free (&_state); } - #if defined __xlC__ || defined __HP_aCC || defined __SUNPRO_CC + #if defined __xlC__ || defined __HP_aCC || defined __SUNPRO_CC || defined __EDG__ public: #else private: -- 2.39.5