From e0fea71cb934931921053a3d89b7912cb3262306 Mon Sep 17 00:00:00 2001 From: vlm Date: Mon, 29 Aug 2005 10:31:14 +0000 Subject: YuanMeng was very helpful in finding these git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@981 59561ff5-6e30-0410-9f3c-9617f08c8826 --- tests/92-circular-loops-OK.asn1.-Pfindirect-choice | 82 +++++++++++----------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'tests/92-circular-loops-OK.asn1.-Pfindirect-choice') diff --git a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice index 3dbef5a4..fd06d826 100644 --- a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice +++ b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice @@ -50,70 +50,70 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { { ATF_POINTER, 0, offsetof(struct Everything, ch1), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice1, + .type = &asn_DEF_Choice1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch1" }, { ATF_POINTER, 0, offsetof(struct Everything, ch2), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice2, + .type = &asn_DEF_Choice2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch2" }, { ATF_POINTER, 0, offsetof(struct Everything, ch3), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice3, + .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch3" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, set), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, a), .tag = (ASN_TAG_CLASS_CONTEXT | (4 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, b), .tag = (ASN_TAG_CLASS_CONTEXT | (5 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, g), .tag = (ASN_TAG_CLASS_CONTEXT | (6 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, ot), .tag = (ASN_TAG_CLASS_CONTEXT | (7 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_OneTwo, + .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ot" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, tt), .tag = (ASN_TAG_CLASS_CONTEXT | (8 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "tt" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, to), .tag = (ASN_TAG_CLASS_CONTEXT | (9 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ThreeOne, + .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "to" }, @@ -212,14 +212,14 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { { ATF_POINTER, 0, offsetof(struct Choice1, choice.something), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "something" }, { ATF_POINTER, 0, offsetof(struct Choice1, choice.some2), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "some2" }, @@ -308,14 +308,14 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { { ATF_POINTER, 0, offsetof(struct Choice2, choice.typeref), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TypeRef, + .type = &asn_DEF_TypeRef, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "typeref" }, { ATF_POINTER, 0, offsetof(struct Choice2, choice.some3), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "some3" }, @@ -414,7 +414,7 @@ static asn_TYPE_member_t asn_MBR_a_2[] = { { ATF_POINTER, 0, offsetof(struct a, aa), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "aa" }, @@ -461,7 +461,7 @@ static asn_TYPE_member_t asn_MBR_c_5[] = { { ATF_POINTER, 0, 0, .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_Choice3, + .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -502,21 +502,21 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { { ATF_POINTER, 0, offsetof(struct Choice3, choice.a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_a_2, + .type = &asn_DEF_a_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 0, offsetof(struct Choice3, choice.b), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 0, offsetof(struct Choice3, choice.c), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_c_5, + .type = &asn_DEF_c_5, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "c" }, @@ -605,35 +605,35 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { { ATF_NOFLAGS, 0, offsetof(struct Member, Int), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "int" }, { ATF_POINTER, 0, offsetof(struct Member, set), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, { ATF_POINTER, 0, offsetof(struct Member, seq), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "seq" }, { ATF_POINTER, 2, offsetof(struct Member, set2), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set2" }, { ATF_POINTER, 1, offsetof(struct Member, set3), .tag = (ASN_TAG_CLASS_CONTEXT | (4 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set3" }, @@ -683,7 +683,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Member_2, + .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -760,28 +760,28 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Sequence, a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 3, offsetof(struct Sequence, seq), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "seq" }, { ATF_POINTER, 2, offsetof(struct Sequence, b), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 1, offsetof(struct Sequence, set), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, @@ -981,7 +981,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { { ATF_POINTER, 1, offsetof(struct b, b), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1028,14 +1028,14 @@ static asn_TYPE_member_t asn_MBR_Alpha_1[] = { { ATF_POINTER, 0, offsetof(struct Alpha, a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct Alpha, b), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_b_3, + .type = &asn_DEF_b_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1112,14 +1112,14 @@ static asn_TYPE_member_t asn_MBR_Beta_1[] = { { ATF_POINTER, 2, offsetof(struct Beta, b), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 1, offsetof(struct Beta, g), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, @@ -1199,21 +1199,21 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { { ATF_POINTER, 0, offsetof(struct Gamma, o), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "o" }, { ATF_POINTER, 0, offsetof(struct Gamma, a), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 0, offsetof(struct Gamma, b), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1302,7 +1302,7 @@ static asn_TYPE_member_t asn_MBR_OneTwo_1[] = { { ATF_POINTER, 0, offsetof(struct OneTwo, m12), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m12" }, @@ -1395,7 +1395,7 @@ static asn_TYPE_member_t asn_MBR_TwoThree_1[] = { { ATF_POINTER, 0, offsetof(struct TwoThree, m23), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ThreeOne, + .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m23" }, @@ -1492,14 +1492,14 @@ static asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { { ATF_POINTER, 0, offsetof(struct ThreeOne, m31), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_OneTwo, + .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m31" }, { ATF_POINTER, 0, offsetof(struct ThreeOne, g), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, -- cgit v1.2.3