diff options
author | Lev Walkin <vlm@lionet.info> | 2005-08-16 16:57:17 +0000 |
---|---|---|
committer | Lev Walkin <vlm@lionet.info> | 2005-08-16 16:57:17 +0000 |
commit | 8eb4b572fd6985c4d538f241b89d990386bec5a0 (patch) | |
tree | 77243497cdf231419a24862e18f8f68a2ff02c16 | |
parent | cee931eec71817d26569c34df7f1a9e7be514843 (diff) |
de-facto things
-rw-r--r-- | tests/19-param-OK.asn1.-P | 4 | ||||
-rw-r--r-- | tests/31-set-of-OK.asn1.-P | 6 | ||||
-rw-r--r-- | tests/32-sequence-of-OK.asn1.-P | 4 | ||||
-rw-r--r-- | tests/39-sequence-of-OK.asn1.-P | 2 | ||||
-rw-r--r-- | tests/42-real-life-OK.asn1.-PR | 8 | ||||
-rw-r--r-- | tests/43-recursion-OK.asn1.-P | 7 | ||||
-rw-r--r-- | tests/59-choice-extended-OK.asn1.-P | 5 | ||||
-rw-r--r-- | tests/66-ref-simple-OK.asn1.-P | 2 | ||||
-rw-r--r-- | tests/70-xer-test-OK.asn1.-P | 10 | ||||
-rw-r--r-- | tests/72-same-names-OK.asn1.-P | 2 | ||||
-rw-r--r-- | tests/73-circular-OK.asn1.-P | 6 |
11 files changed, 29 insertions, 27 deletions
diff --git a/tests/19-param-OK.asn1.-P b/tests/19-param-OK.asn1.-P index 82ace9cc..5b7fc38f 100644 --- a/tests/19-param-OK.asn1.-P +++ b/tests/19-param-OK.asn1.-P @@ -218,7 +218,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Name; /*** <<< STAT-DEFS [Name] >>> ***/ static asn_TYPE_member_t asn_MBR_Name_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_RelativeDistinguishedName, @@ -334,7 +334,7 @@ memb_IA5String_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /*** <<< STAT-DEFS [RelativeDistinguishedName] >>> ***/ static asn_TYPE_member_t asn_MBR_RelativeDistinguishedName_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (22 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_IA5String, diff --git a/tests/31-set-of-OK.asn1.-P b/tests/31-set-of-OK.asn1.-P index 03cd72dc..7c5acab0 100644 --- a/tests/31-set-of-OK.asn1.-P +++ b/tests/31-set-of-OK.asn1.-P @@ -28,7 +28,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Forest; /*** <<< STAT-DEFS [Forest] >>> ***/ static asn_TYPE_member_t asn_MBR_Forest_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Tree, @@ -231,7 +231,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Stuff; /*** <<< STAT-DEFS [Stuff] >>> ***/ static asn_TYPE_member_t asn_MBR_trees_2[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Forest, @@ -318,7 +318,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_5 = { }; static asn_TYPE_member_t asn_MBR_anything_4[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Member_5, diff --git a/tests/32-sequence-of-OK.asn1.-P b/tests/32-sequence-of-OK.asn1.-P index e7ba2bd8..f83b74f0 100644 --- a/tests/32-sequence-of-OK.asn1.-P +++ b/tests/32-sequence-of-OK.asn1.-P @@ -28,7 +28,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Programming; /*** <<< STAT-DEFS [Programming] >>> ***/ static asn_TYPE_member_t asn_MBR_Programming_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ .type = (void *)&asn_DEF_Fault, @@ -96,7 +96,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Fault; /*** <<< STAT-DEFS [Fault] >>> ***/ static asn_TYPE_member_t asn_MBR_Fault_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Error, diff --git a/tests/39-sequence-of-OK.asn1.-P b/tests/39-sequence-of-OK.asn1.-P index d4348fa9..d0db433d 100644 --- a/tests/39-sequence-of-OK.asn1.-P +++ b/tests/39-sequence-of-OK.asn1.-P @@ -36,7 +36,7 @@ extern asn_TYPE_descriptor_t asn_DEF_T; /*** <<< STAT-DEFS [T] >>> ***/ static asn_TYPE_member_t asn_MBR_collection_3[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_T2, diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR index f0aef03d..93397537 100644 --- a/tests/42-real-life-OK.asn1.-PR +++ b/tests/42-real-life-OK.asn1.-PR @@ -69,7 +69,7 @@ memb_varsets_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /*** <<< STAT-DEFS [LogLine] >>> ***/ static asn_TYPE_member_t asn_MBR_varsets_3[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_VariablePartSet, @@ -225,7 +225,7 @@ memb_vparts_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /*** <<< STAT-DEFS [VariablePartSet] >>> ***/ static asn_TYPE_member_t asn_MBR_vparts_2[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, .type = (void *)&asn_DEF_VariablePart, @@ -403,7 +403,7 @@ memb_vset_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /*** <<< STAT-DEFS [VariablePart] >>> ***/ static asn_TYPE_member_t asn_MBR_vset_2[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_VisibleString, @@ -719,7 +719,7 @@ asn_TYPE_descriptor_t asn_DEF_accept_as_2 = { }; static asn_TYPE_member_t asn_MBR_email_9[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_VisibleString, diff --git a/tests/43-recursion-OK.asn1.-P b/tests/43-recursion-OK.asn1.-P index 6d83f612..03b85225 100644 --- a/tests/43-recursion-OK.asn1.-P +++ b/tests/43-recursion-OK.asn1.-P @@ -45,7 +45,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Test_structure_1; /*** <<< STAT-DEFS [Test-structure-1] >>> ***/ static asn_TYPE_member_t asn_MBR_t_member1_2[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Test_structure_1, @@ -85,7 +85,7 @@ asn_TYPE_descriptor_t asn_DEF_t_member1_2 = { }; static asn_TYPE_member_t asn_MBR_t_member2_4[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Test_structure_1, @@ -196,7 +196,6 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_1 = { /*** <<< INCLUDES [Choice-1] >>> ***/ -#include <Choice-1.h> #include <INTEGER.h> #include <asn_SET_OF.h> #include <constr_SET_OF.h> @@ -247,7 +246,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Choice_1; /*** <<< STAT-DEFS [Choice-1] >>> ***/ static asn_TYPE_member_t asn_MBR_or_3[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, .type = (void *)&asn_DEF_Choice_1, diff --git a/tests/59-choice-extended-OK.asn1.-P b/tests/59-choice-extended-OK.asn1.-P index f7f8a2c6..de9c55ed 100644 --- a/tests/59-choice-extended-OK.asn1.-P +++ b/tests/59-choice-extended-OK.asn1.-P @@ -2,7 +2,6 @@ /*** <<< INCLUDES [Choice] >>> ***/ #include <INTEGER.h> -#include <Choice.h> #include <constr_CHOICE.h> /*** <<< DEPS [Choice] >>> ***/ @@ -41,6 +40,10 @@ typedef struct Choice { extern asn_TYPE_descriptor_t asn_DEF_Choice; +/*** <<< POST-INCLUDE [Choice] >>> ***/ + +#include <Choice.h> + /*** <<< STAT-DEFS [Choice] >>> ***/ static asn_TYPE_member_t asn_MBR_Choice_1[] = { diff --git a/tests/66-ref-simple-OK.asn1.-P b/tests/66-ref-simple-OK.asn1.-P index d269a7a1..7cad785f 100644 --- a/tests/66-ref-simple-OK.asn1.-P +++ b/tests/66-ref-simple-OK.asn1.-P @@ -21,7 +21,7 @@ extern asn_TYPE_descriptor_t asn_DEF_T; /*** <<< STAT-DEFS [T] >>> ***/ static asn_TYPE_member_t asn_MBR_T_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_SimpleType, diff --git a/tests/70-xer-test-OK.asn1.-P b/tests/70-xer-test-OK.asn1.-P index 74c0b1d9..5a9d64fb 100644 --- a/tests/70-xer-test-OK.asn1.-P +++ b/tests/70-xer-test-OK.asn1.-P @@ -786,7 +786,7 @@ extern asn_TYPE_descriptor_t asn_DEF_SetOf; /*** <<< STAT-DEFS [SetOf] >>> ***/ static asn_TYPE_member_t asn_MBR_SetOf_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (9 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_REAL, @@ -847,7 +847,7 @@ extern asn_TYPE_descriptor_t asn_DEF_SetOfNULL; /*** <<< STAT-DEFS [SetOfNULL] >>> ***/ static asn_TYPE_member_t asn_MBR_SetOfNULL_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (5 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_NULL, @@ -1028,7 +1028,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { }; static asn_TYPE_member_t asn_MBR_SetOfEnums_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Member_2, @@ -1089,7 +1089,7 @@ extern asn_TYPE_descriptor_t asn_DEF_SequenceOf; /*** <<< STAT-DEFS [SequenceOf] >>> ***/ static asn_TYPE_member_t asn_MBR_SequenceOf_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_INTEGER, @@ -1150,7 +1150,7 @@ extern asn_TYPE_descriptor_t asn_DEF_SeqOfZuka; /*** <<< STAT-DEFS [SeqOfZuka] >>> ***/ static asn_TYPE_member_t asn_MBR_SeqOfZuka_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (5 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_NULL, diff --git a/tests/72-same-names-OK.asn1.-P b/tests/72-same-names-OK.asn1.-P index 1e8b3e39..61a0dbed 100644 --- a/tests/72-same-names-OK.asn1.-P +++ b/tests/72-same-names-OK.asn1.-P @@ -84,7 +84,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { }; static asn_TYPE_member_t asn_MBR_Type_1[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Member_2, diff --git a/tests/73-circular-OK.asn1.-P b/tests/73-circular-OK.asn1.-P index 0def1eee..6d91ed62 100644 --- a/tests/73-circular-OK.asn1.-P +++ b/tests/73-circular-OK.asn1.-P @@ -34,7 +34,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Type; /*** <<< STAT-DEFS [Type] >>> ***/ static asn_TYPE_member_t asn_MBR_data_2[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_EpytRef, @@ -276,7 +276,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Epyt; /*** <<< STAT-DEFS [Epyt] >>> ***/ static asn_TYPE_member_t asn_MBR_stype_2[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_Type, @@ -510,7 +510,7 @@ memb_patest2_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /*** <<< STAT-DEFS [Ypet] >>> ***/ static asn_TYPE_member_t asn_MBR_senums_4[] = { - { ATF_NOFLAGS, 0, 0, + { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), .tag_mode = 0, .type = (void *)&asn_DEF_EnumType, |