From 666adc2dc0c9958fc25fd17d8954e40a5602a019 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 28 May 2011 22:33:37 -0400 Subject: [PATCH] Volatile not necessary after all I was temporarily confused. --- glib/garray.c | 4 ++-- glib/gasyncqueue.c | 2 +- glib/ghash.c | 2 +- glib/gtree.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glib/garray.c b/glib/garray.c index 7c90f63..d498d23 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -107,7 +107,7 @@ struct _GRealArray guint elt_size; guint zero_terminated : 1; guint clear : 1; - volatile gint ref_count; + gint ref_count; }; /** @@ -759,7 +759,7 @@ struct _GRealPtrArray gpointer *pdata; guint len; guint alloc; - volatile gint ref_count; + gint ref_count; GDestroyNotify element_free_func; }; diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c index d7f14ec..02284ac 100644 --- a/glib/gasyncqueue.c +++ b/glib/gasyncqueue.c @@ -95,7 +95,7 @@ struct _GAsyncQueue GQueue queue; GDestroyNotify item_free_func; guint waiting_threads; - volatile gint ref_count; + gint ref_count; }; typedef struct { diff --git a/glib/ghash.c b/glib/ghash.c index 54db82e..f381eaa 100644 --- a/glib/ghash.c +++ b/glib/ghash.c @@ -220,7 +220,7 @@ struct _GHashTable GHashFunc hash_func; GEqualFunc key_equal_func; - volatile gint ref_count; + gint ref_count; #ifndef G_DISABLE_ASSERT /* * Tracks the structure of the hash table, not its contents: is only diff --git a/glib/gtree.c b/glib/gtree.c index 0c41ff9..7f016d7 100644 --- a/glib/gtree.c +++ b/glib/gtree.c @@ -85,7 +85,7 @@ struct _GTree GDestroyNotify value_destroy_func; gpointer key_compare_data; guint nnodes; - volatile gint ref_count; + gint ref_count; }; struct _GTreeNode -- 2.7.4