summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2023-04-24 10:39:08 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2023-04-24 10:39:08 +0200
commitc80e95b8efadbc7f56cdcd10e910c19ad4a411c4 (patch)
treeb0738a884047541103b7b77f9de72dea3c48cae3
parente6bc168ce69b16437ac5556fe537675ab2cd189f (diff)
downloadvala-wip/issue/1429.tar.gz
Update tests (partly correct)wip/issue/1429
-rw-r--r--tests/annotations/deprecated-struct-minimal.c-expected2
-rw-r--r--tests/annotations/deprecated.c-expected8
-rw-r--r--tests/girwriter/GirTest-1.0.gir-expected2
-rw-r--r--tests/girwriter/girtest.vapigen-expected1
4 files changed, 7 insertions, 6 deletions
diff --git a/tests/annotations/deprecated-struct-minimal.c-expected b/tests/annotations/deprecated-struct-minimal.c-expected
index cbc9b5d9d..3bdad4fc4 100644
--- a/tests/annotations/deprecated-struct-minimal.c-expected
+++ b/tests/annotations/deprecated-struct-minimal.c-expected
@@ -6,7 +6,7 @@
typedef struct _Foo Foo;
struct _Foo {
- void* bar;
+ void* bar G_GNUC_DEPRECATED ;
} G_GNUC_DEPRECATED ;
static void _vala_main (void);
diff --git a/tests/annotations/deprecated.c-expected b/tests/annotations/deprecated.c-expected
index 808df9983..89146b389 100644
--- a/tests/annotations/deprecated.c-expected
+++ b/tests/annotations/deprecated.c-expected
@@ -89,7 +89,7 @@ struct _FooClassClass {
};
struct _FooClassPrivate {
- gint _bar;
+ gint _bar G_GNUC_DEPRECATED ;
};
struct _AFoo {
@@ -125,8 +125,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (FooClass, g_object_unref)
VALA_EXTERN gint fooclass_foov (FooClass* self) G_GNUC_DEPRECATED ;
VALA_EXTERN gint fooclass_foo (FooClass* self) G_GNUC_DEPRECATED ;
static gint fooclass_real_foov (FooClass* self) G_GNUC_DEPRECATED ;
-VALA_EXTERN FooClass* fooclass_new (void);
-VALA_EXTERN FooClass* fooclass_construct (GType object_type);
+VALA_EXTERN FooClass* fooclass_new (void) G_GNUC_DEPRECATED ;
+VALA_EXTERN FooClass* fooclass_construct (GType object_type) G_GNUC_DEPRECATED ;
VALA_EXTERN gint fooclass_get_bar (FooClass* self) G_GNUC_DEPRECATED ;
VALA_EXTERN void fooclass_set_bar (FooClass* self,
gint value) G_GNUC_DEPRECATED ;
@@ -145,7 +145,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (AFoo, g_object_unref)
VALA_EXTERN gint afoo_fooa (AFoo* self) G_GNUC_DEPRECATED ;
VALA_EXTERN gint afoo_foo (AFoo* self) G_GNUC_DEPRECATED ;
static gint afoo_real_fooa (AFoo* self) G_GNUC_DEPRECATED ;
-VALA_EXTERN AFoo* afoo_construct (GType object_type);
+VALA_EXTERN AFoo* afoo_construct (GType object_type) G_GNUC_DEPRECATED ;
static GType afoo_get_type_once (void);
VALA_EXTERN GType ifoo_get_type (void) G_GNUC_CONST ;
G_DEFINE_AUTOPTR_CLEANUP_FUNC (IFoo, g_object_unref)
diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index 5aafe5126..30652024b 100644
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -1880,7 +1880,7 @@
<field name="priv" readable="0" private="1">
<type name="DeprecatedClassTestPrivate" c:type="GirTestDeprecatedClassTestPrivate*"/>
</field>
- <constructor name="new" c:identifier="gir_test_deprecated_class_test_new">
+ <constructor name="new" c:identifier="gir_test_deprecated_class_test_new" deprecated="1">
<return-value transfer-ownership="full">
<type name="GirTest.DeprecatedClassTest" c:type="GirTestDeprecatedClassTest*"/>
</return-value>
diff --git a/tests/girwriter/girtest.vapigen-expected b/tests/girwriter/girtest.vapigen-expected
index d559fbea0..9da0784eb 100644
--- a/tests/girwriter/girtest.vapigen-expected
+++ b/tests/girwriter/girtest.vapigen-expected
@@ -33,6 +33,7 @@ namespace GirTest {
public class DeprecatedClassTest {
public int ref_count;
[CCode (has_construct_function = false)]
+ [Version (deprecated = true)]
public DeprecatedClassTest ();
}
[CCode (cheader_filename = "girtest.h", type_id = "gir_test_generics_object_test_get_type ()")]