diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-09-05 00:14:48 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-09-05 04:00:14 +0200 |
| commit | a36c175994d9701aa15d10ff948bcb0782b53612 (patch) | |
| tree | 6363580ec7f80b675ca38985c97bf1071d330304 | |
| parent | dc75458862bd490da9d824900efa604ab7876f21 (diff) | |
| download | gnulib-a36c175994d9701aa15d10ff948bcb0782b53612.tar.gz | |
oset-c++: Fix compilation error with MSVC 14.
* lib/gl_oset.hh: With MSVC, avoid 'friend'.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/gl_oset.hh | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2022-09-04 Bruno Haible <bruno@clisp.org> + oset-c++: Fix compilation error with MSVC 14. + * lib/gl_oset.hh: With MSVC, avoid 'friend'. + +2022-09-04 Bruno Haible <bruno@clisp.org> + glob tests: Fix link error on mingw. * modules/glob-tests (Makefile.am): Link test-glob with $(LIBINTL). 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: |