From 19da3f81593614198206c45527f973a22cdd621e Mon Sep 17 00:00:00 2001
From: Mark Doffman <mark.doffman@codethink.co.uk>
Date: Thu, 27 Mar 2014 20:49:20 +0000
Subject: Revert "gimarshallingtests: Add array/GList uint32/64 in/out API"

This reverts commit 3d742120bd6a0ff7c44362f37e99a0af5bba70ca.
---
 tests/gimarshallingtests.c | 64 ----------------------------------------------
 tests/gimarshallingtests.h |  4 ---
 2 files changed, 68 deletions(-)

diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c
index 3d6e3453..3eb6e075 100644
--- a/tests/gimarshallingtests.c
+++ b/tests/gimarshallingtests.c
@@ -1728,28 +1728,6 @@ gi_marshalling_tests_garray_int_none_return (void)
     return array;
 }
 
-/**
- * gi_marshalling_tests_garray_uint64_none_return:
- *
- * Returns: (element-type guint64) (transfer none):
- */
-GArray *
-gi_marshalling_tests_garray_uint64_none_return (void)
-{
-    static GArray *array = NULL;
-    guint64 i;
-
-    if (array == NULL) {
-        array = g_array_new (TRUE, TRUE, sizeof (guint64));
-        i = 0;
-        g_array_append_val (array, i);
-        i = G_MAXUINT64;
-        g_array_append_val (array, i);
-    }
-
-    return array;
-}
-
 /**
  * gi_marshalling_tests_garray_utf8_none_return:
  *
@@ -1825,18 +1803,6 @@ gi_marshalling_tests_garray_int_none_in (GArray *array_)
     g_assert_cmpint(g_array_index (array_, gint, 3), ==, 2);
 }
 
-/**
- * gi_marshalling_tests_garray_uint64_none_in:
- * @array_: (element-type guint64) (transfer none):
- */
-void
-gi_marshalling_tests_garray_uint64_none_in (GArray *array_)
-{
-    g_assert_cmpint(array_->len, ==, 2);
-    g_assert_cmpint(g_array_index (array_, guint64, 0), ==, 0);
-    g_assert_cmpint(g_array_index (array_, guint64, 1), ==, G_MAXUINT64);
-}
-
 /**
  * gi_marshalling_tests_garray_utf8_none_in:
  * @array_: (element-type utf8) (transfer none):
@@ -2309,24 +2275,6 @@ gi_marshalling_tests_glist_int_none_return (void)
     return list;
 }
 
-/**
- * gi_marshalling_tests_glist_uint32_none_return:
- *
- * Returns: (element-type guint32) (transfer none):
- */
-GList *
-gi_marshalling_tests_glist_uint32_none_return (void)
-{
-    static GList *list = NULL;
-
-    if (list == NULL) {
-        list = g_list_append(list, GUINT_TO_POINTER(0));
-        list = g_list_append(list, GUINT_TO_POINTER(G_MAXUINT32));
-    }
-
-    return list;
-}
-
 /**
  * gi_marshalling_tests_glist_utf8_none_return:
  *
@@ -2394,18 +2342,6 @@ gi_marshalling_tests_glist_int_none_in (GList *list)
     g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 3)), ==, 2);
 }
 
-/**
- * gi_marshalling_tests_glist_uint32_none_in:
- * @list: (element-type guint32) (transfer none):
- */
-void
-gi_marshalling_tests_glist_uint32_none_in (GList *list)
-{
-    g_assert_cmpint(g_list_length(list), ==, 2);
-    g_assert_cmpint(GPOINTER_TO_UINT(g_list_nth_data(list, 0)), ==, 0);
-    g_assert_cmpint(GPOINTER_TO_UINT(g_list_nth_data(list, 1)), ==, G_MAXUINT32);
-}
-
 /**
  * gi_marshalling_tests_glist_utf8_none_in:
  * @list: (element-type utf8) (transfer none):
diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h
index 7768a881..cdcb08e6 100644
--- a/tests/gimarshallingtests.h
+++ b/tests/gimarshallingtests.h
@@ -422,13 +422,11 @@ GVariant **gi_marshalling_tests_array_gvariant_full_in (GVariant **variants);
 /* GArray */
 
 GArray *gi_marshalling_tests_garray_int_none_return (void);
-GArray *gi_marshalling_tests_garray_uint64_none_return (void);
 GArray *gi_marshalling_tests_garray_utf8_none_return (void);
 GArray *gi_marshalling_tests_garray_utf8_container_return (void);
 GArray *gi_marshalling_tests_garray_utf8_full_return (void);
 
 void gi_marshalling_tests_garray_int_none_in (GArray *array_);
-void gi_marshalling_tests_garray_uint64_none_in (GArray *array_);
 void gi_marshalling_tests_garray_utf8_none_in (GArray *array_);
 
 void gi_marshalling_tests_garray_utf8_none_out (GArray **array_);
@@ -469,13 +467,11 @@ void gi_marshalling_tests_gstrv_inout (GStrv *g_strv);
 /* GList */
 
 GList *gi_marshalling_tests_glist_int_none_return (void);
-GList *gi_marshalling_tests_glist_uint32_none_return (void);
 GList *gi_marshalling_tests_glist_utf8_none_return (void);
 GList *gi_marshalling_tests_glist_utf8_container_return (void);
 GList *gi_marshalling_tests_glist_utf8_full_return (void);
 
 void gi_marshalling_tests_glist_int_none_in (GList *list);
-void gi_marshalling_tests_glist_uint32_none_in (GList *list);
 void gi_marshalling_tests_glist_utf8_none_in (GList *list);
 
 void gi_marshalling_tests_glist_utf8_none_out (GList **list);
-- 
cgit v1.2.1