From a36c175994d9701aa15d10ff948bcb0782b53612 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 5 Sep 2022 00:14:48 +0200 Subject: [PATCH] oset-c++: Fix compilation error with MSVC 14. * lib/gl_oset.hh: With MSVC, avoid 'friend'. --- ChangeLog | 5 +++++ lib/gl_oset.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee53375b54..3142b87761 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 7443d645a1..2f8d6bda7e 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: -- 2.39.5