]> Savannah Git Hosting - gnulib.git/commitdiff
oset-c++: Fix compilation error with MSVC 14.
authorBruno Haible <bruno@clisp.org>
Sun, 4 Sep 2022 22:14:48 +0000 (00:14 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 4 Sep 2022 22:14:48 +0000 (00:14 +0200)
* lib/gl_oset.hh: With MSVC, avoid 'friend'.

ChangeLog
lib/gl_oset.hh

index c6941dd485a2b384a0c5b4130be10abdb562c863..2e951cce845f94c6b4929f69428e5a40178f7ceb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
index 4fae4eb4d61a643cfc2f563df5c0625730b98cea..d0844638b7566d74c7fc7fa3fc6e58f60904a46f 100644 (file)
@@ -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: