From: Bruno Haible Date: Wed, 30 Dec 2020 01:12:33 +0000 (+0100) Subject: list-c++, [o]map-c++, [o]set-c++: Fix conflict with 'free-posix' module. X-Git-Tag: v1.0~3273 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=7f87a14c29ab184fcd1db5f85823483fb2b75c78;p=gnulib.git list-c++, [o]map-c++, [o]set-c++: Fix conflict with 'free-posix' module. * lib/gl_list.hh: Include . * lib/gl_map.hh: Likewise. * lib/gl_omap.hh: Likewise. * lib/gl_set.hh: Likewise. * lib/gl_oset.hh: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 0ef300f0b0..cca14c9104 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2020-12-29 Bruno Haible + + list-c++, [o]map-c++, [o]set-c++: Fix conflict with 'free-posix' module. + * lib/gl_list.hh: Include . + * lib/gl_map.hh: Likewise. + * lib/gl_omap.hh: Likewise. + * lib/gl_set.hh: Likewise. + * lib/gl_oset.hh: Likewise. + 2020-12-29 Paul Eggert canonicalize: fix ptrdiff_t overflow bug diff --git a/lib/gl_list.hh b/lib/gl_list.hh index 8b0ccad1ba..85e06b9581 100644 --- a/lib/gl_list.hh +++ b/lib/gl_list.hh @@ -23,6 +23,8 @@ #include "gl_sublist.h" #include "gl_xsublist.h" +#include /* because Gnulib's may '#define free ...' */ + /* gl_List is a C++ wrapper around the gl_list data type. Its element type is 'ELTYPE *'. diff --git a/lib/gl_map.hh b/lib/gl_map.hh index 082694fe6b..8e946d6153 100644 --- a/lib/gl_map.hh +++ b/lib/gl_map.hh @@ -21,6 +21,8 @@ #include "gl_map.h" #include "gl_xmap.h" +#include /* because Gnulib's may '#define free ...' */ + /* gl_Map is a C++ wrapper around the gl_map data type. Its key type is 'KEYTYPE *'. Its value type is 'VALUETYPE *'. diff --git a/lib/gl_omap.hh b/lib/gl_omap.hh index 903befb55d..953c9c011e 100644 --- a/lib/gl_omap.hh +++ b/lib/gl_omap.hh @@ -21,6 +21,8 @@ #include "gl_omap.h" #include "gl_xomap.h" +#include /* because Gnulib's may '#define free ...' */ + /* gl_OMap is a C++ wrapper around the gl_omap data type. Its key type is 'KEYTYPE *'. Its value type is 'VALUETYPE *'. diff --git a/lib/gl_oset.hh b/lib/gl_oset.hh index 8a7edc9c7a..5150e79226 100644 --- a/lib/gl_oset.hh +++ b/lib/gl_oset.hh @@ -21,6 +21,8 @@ #include "gl_oset.h" #include "gl_xoset.h" +#include /* because Gnulib's may '#define free ...' */ + /* gl_OSet is a C++ wrapper around the gl_oset data type. Its element type is 'ELTYPE *'. diff --git a/lib/gl_set.hh b/lib/gl_set.hh index 3b64bc5b1a..67b4a23ac4 100644 --- a/lib/gl_set.hh +++ b/lib/gl_set.hh @@ -21,6 +21,8 @@ #include "gl_set.h" #include "gl_xset.h" +#include /* because Gnulib's may '#define free ...' */ + /* gl_Set is a C++ wrapper around the gl_set data type. Its element type is 'ELTYPE *'.