From: Bruno Haible Date: Sun, 4 Sep 2022 22:14:48 +0000 (+0200) Subject: oset-c++: Fix compilation error with MSVC 14. X-Git-Tag: v1.0~2070 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=3e99f32e957ac7f1f5b3dd464486cb192fb6dad4;p=gnulib.git oset-c++: Fix compilation error with MSVC 14. * lib/gl_oset.hh: With MSVC, avoid 'friend'. --- diff --git a/ChangeLog b/ChangeLog index c6941dd485..2e951cce84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2022-09-04 Bruno Haible + + oset-c++: Fix compilation error with MSVC 14. + * lib/gl_oset.hh: With MSVC, avoid 'friend'. + 2022-09-04 Bruno Haible glob tests: Fix link error on mingw. diff --git a/lib/gl_oset.hh b/lib/gl_oset.hh index 4fae4eb4d6..d0844638b7 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 || defined __EDG__ + #if defined __xlC__ || defined __HP_aCC || defined __SUNPRO_CC || defined __EDG__ || (defined _MSC_VER && !defined __clang__) public: #else private: