summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2015-07-24 09:49:20 +0200
committerMurray Cumming <murrayc@murrayc.com>2015-07-24 09:50:32 +0200
commit02206202d0754a51ee6914c46549f2dfd274b4ac (patch)
treeacb7d5e72e1b5812fb3ad6fa164149459d4481c3 /glib
parent7d2e6b84c6e4e5a371887f98f42b56aaf94834ab (diff)
downloadglibmm-02206202d0754a51ee6914c46549f2dfd274b4ac.tar.gz
Revert "Glib::List_Iterator (and similar): Deprecate via ifdef."
This reverts commit 05610cec2ccbc54f20fcc3e995e41649f21c5714. See the commit in the previous commit about gtkmm-2.24. This is a temporary act of kindness to Inkscape.
Diffstat (limited to 'glib')
-rw-r--r--glib/glibmm/containers.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/glib/glibmm/containers.h b/glib/glibmm/containers.h
index d863e5e5..7d78854b 100644
--- a/glib/glibmm/containers.h
+++ b/glib/glibmm/containers.h
@@ -21,8 +21,6 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef GLIBMM_DISABLE_DEPRECATED
-
#include <glibmmconfig.h>
#include <glibmm/sarray.h> /* for backward compatibility */
#include <glib.h>
@@ -360,6 +358,4 @@ public:
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-#endif //GLIBMM_DISABLE_DEPRECATED
-
#endif /* _GLIBMM_CONTAINERS_H */