diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2015-07-24 09:47:04 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2015-07-24 09:50:16 +0200 |
| commit | 7d2e6b84c6e4e5a371887f98f42b56aaf94834ab (patch) | |
| tree | 298096ae3bd75803fb04654d135089a08c1ab36a | |
| parent | dd5e56fa26d5fce8aa6fd7d14d3a1c41db0f8d5a (diff) | |
| download | glibmm-7d2e6b84c6e4e5a371887f98f42b56aaf94834ab.tar.gz | |
HelperList: Don't use ifndef GLIBMM_DISABLE_DEPRECATED around this.
To avoid breaking the gtkmm-2.24 build with --enable-warnings=fatal,
and the build of apps that do this too.
However, those apps (Inkscape) need to stop using that ancient
deprecated version of gtkmm.
Bug #752797
| -rw-r--r-- | glib/glibmm/helperlist.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/glib/glibmm/helperlist.h b/glib/glibmm/helperlist.h index 2028a1df..1c9b9ba5 100644 --- a/glib/glibmm/helperlist.h +++ b/glib/glibmm/helperlist.h @@ -22,7 +22,11 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef GLIBMM_DISABLE_DEPRECATED +//This is not hidden by GLIBMM_DISABLE_DEPRECATED +//because gtkmm-2.24 still uses this type in its public API. +//Note that gtkmm-2.24 itself is completely deprecated, so we really +//can remove this whole class some time soon. +//#ifndef GLIBMM_DISABLE_DEPRECATED #include <glibmm/containers.h> @@ -169,7 +173,7 @@ protected: } /* namespace Glib */ -#endif //GLIBMM_DISABLE_DEPRECATED +//#endif //GLIBMM_DISABLE_DEPRECATED #endif /* _GLIBMM_HELPERLIST_H */ |