Don't use G_DISABLE_DEPRECATED guards around deprecated functions

[platform/upstream/glib.git] / glib / gtree.h

diff --git a/glib/gtree.h b/glib/gtree.h
index a8bbda8..e17a518 100644 (file)
--- a/glib/gtree.h
+++ b/glib/gtree.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
@@ -50,6 +50,8 @@ GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
                                  gpointer          key_compare_data,
                                  GDestroyNotify    key_destroy_func,
                                  GDestroyNotify    value_destroy_func);
+GTree*   g_tree_ref             (GTree            *tree);
+void     g_tree_unref           (GTree            *tree);
 void     g_tree_destroy         (GTree            *tree);
 void     g_tree_insert          (GTree            *tree,
                                  gpointer          key,
@@ -71,12 +73,11 @@ void     g_tree_foreach         (GTree            *tree,
                                  GTraverseFunc    func,
                                  gpointer         user_data);
 
-#ifndef G_DISABLE_DEPRECATED
+GLIB_DEPRECATED
 void     g_tree_traverse        (GTree            *tree,
                                  GTraverseFunc     traverse_func,
                                  GTraverseType     traverse_type,
                                  gpointer          user_data);
-#endif /* G_DISABLE_DEPRECATED */
 
 gpointer g_tree_search          (GTree            *tree,
                                  GCompareFunc      search_func,