[glibmm] HelperList: Don't use ifndef GLIBMM_DISABLE_DEPRECATED around this.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] HelperList: Don't use ifndef GLIBMM_DISABLE_DEPRECATED around this.
- Date: Fri, 24 Jul 2015 08:13:06 +0000 (UTC)
commit 7d2e6b84c6e4e5a371887f98f42b56aaf94834ab
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Jul 24 09:47:04 2015 +0200
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
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 2028a1d..1c9b9ba 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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]