[glibmm] Revert "Glib::List_Iterator (and similar): Deprecate via ifdef."



commit 02206202d0754a51ee6914c46549f2dfd274b4ac
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jul 24 09:49:20 2015 +0200

    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.

 glib/glibmm/containers.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/glib/glibmm/containers.h b/glib/glibmm/containers.h
index d863e5e..7d78854 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 */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]