From 054c6476495a6f85ae708ed81b9053bf666897b7 Mon Sep 17 00:00:00 2001
From: Rob Taylor <rob.taylor@collabora.co.uk>
Date: Wed, 25 Oct 2006 18:34:49 +0100
Subject: Dont shadow index. Rename useage of index to index_. Thanks stdlib...
 Closes #8353.

---
 dbus/dbus-gtype-specialized.c | 12 ++++++------
 dbus/dbus-gvalue.c            | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dbus/dbus-gtype-specialized.c b/dbus/dbus-gtype-specialized.c
index f4d2366..b20ab3f 100644
--- a/dbus/dbus-gtype-specialized.c
+++ b/dbus/dbus-gtype-specialized.c
@@ -487,10 +487,10 @@ dbus_g_type_get_map_value_specialization (GType gtype)
 }
 
 GType
-dbus_g_type_get_struct_member_type (GType gtype, guint index)
+dbus_g_type_get_struct_member_type (GType gtype, guint index_)
 {
   g_return_val_if_fail (dbus_g_type_is_struct (gtype), G_TYPE_INVALID);
-  return get_specialization_index (gtype, index);
+  return get_specialization_index (gtype, index_);
 }
 
 guint
@@ -629,7 +629,7 @@ dbus_g_type_map_value_iterate (const GValue                           *value,
 
 gboolean
 dbus_g_type_struct_get_member (const GValue *value,
-			       guint         index,
+			       guint         index_,
 			       GValue       *dest)
 {
   DBusGTypeSpecializedData *data;
@@ -644,12 +644,12 @@ dbus_g_type_struct_get_member (const GValue *value,
 
   return ((DBusGTypeSpecializedStructVtable *) (data->klass->vtable))->get_member(gtype,
 											   g_value_get_boxed (value),
-											   index, dest);
+											   index_, dest);
 }
 
 gboolean
 dbus_g_type_struct_set_member (GValue       *value,
-			       guint         index,
+			       guint         index_,
 			       const GValue *src)
 {
   DBusGTypeSpecializedData *data;
@@ -664,7 +664,7 @@ dbus_g_type_struct_set_member (GValue       *value,
 
   return ((DBusGTypeSpecializedStructVtable *) (data->klass->vtable))->set_member(gtype,
 											   g_value_get_boxed (value),
-											   index, src);
+											   index_, src);
 }
 
 /**
diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c
index 0e7400e..cb1832c 100644
--- a/dbus/dbus-gvalue.c
+++ b/dbus/dbus-gvalue.c
@@ -1139,18 +1139,18 @@ _dbus_gvalue_demarshal_message  (DBusGValueMarshalCtx    *context,
   GValueArray *ret;
   DBusMessageIter iter;
   int current_type;
-  guint index;
+  guint index_;
   
   ret = g_value_array_new (6);  /* 6 is a typical maximum for arguments */
 
   dbus_message_iter_init (message, &iter);
-  index = 0;
+  index_ = 0;
   while ((current_type = dbus_message_iter_get_arg_type (&iter)) != DBUS_TYPE_INVALID)
     {
       GValue *value;
       GType gtype;
 
-      if (index >= n_types)
+      if (index_ >= n_types)
 	{
 	  g_set_error (error, DBUS_GERROR,
 		       DBUS_GERROR_INVALID_ARGS,
@@ -1159,17 +1159,17 @@ _dbus_gvalue_demarshal_message  (DBusGValueMarshalCtx    *context,
 	}
       
       g_value_array_append (ret, NULL);
-      value = g_value_array_get_nth (ret, index);
+      value = g_value_array_get_nth (ret, index_);
 
-      gtype = types[index]; 
+      gtype = types[index_]; 
       g_value_init (value, gtype);
 
       if (!_dbus_gvalue_demarshal (context, &iter, value, error))
 	goto lose;
       dbus_message_iter_next (&iter);
-      index++;
+      index_++;
     }
-  if (index < n_types)
+  if (index_ < n_types)
     {
       g_set_error (error, DBUS_GERROR,
 		   DBUS_GERROR_INVALID_ARGS,
-- 
cgit v1.2.1