fixed name clash in constraint checking code; also changed braces to double quote in #includes
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@759 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/tests/31-set-of-OK.asn1.-P b/tests/31-set-of-OK.asn1.-P
index 70af42b..c7d8f0b 100644
--- a/tests/31-set-of-OK.asn1.-P
+++ b/tests/31-set-of-OK.asn1.-P
@@ -271,7 +271,7 @@
&asn_SPC_trees_2_specs /* Additional specs */
};
-static asn_TYPE_member_t asn_MBR_Member_4[] = {
+static asn_TYPE_member_t asn_MBR_Member_5[] = {
{ ATF_NOFLAGS, 0, offsetof(struct Member, cup_of_coffee),
.tag = (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)),
.tag_mode = 0,
@@ -280,22 +280,22 @@
.name = "cup-of-coffee"
},
};
-static ber_tlv_tag_t asn_DEF_Member_4_tags[] = {
+static ber_tlv_tag_t asn_DEF_Member_5_tags[] = {
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
-static asn_TYPE_tag2member_t asn_MAP_Member_4_tag2el[] = {
+static asn_TYPE_tag2member_t asn_MAP_Member_5_tag2el[] = {
{ (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), 0, 0, 0 } /* cup-of-coffee at 32 */
};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_4_specs = {
+static asn_SEQUENCE_specifics_t asn_SPC_Member_5_specs = {
sizeof(struct Member),
offsetof(struct Member, _asn_ctx),
- asn_MAP_Member_4_tag2el,
+ asn_MAP_Member_5_tag2el,
1, /* Count of tags in the map */
0, /* Start extensions */
2 /* Stop extensions */
};
static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_4 = {
+asn_TYPE_descriptor_t asn_DEF_Member_5 = {
"",
"",
SEQUENCE_free,
@@ -306,37 +306,37 @@
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
- asn_DEF_Member_4_tags,
- sizeof(asn_DEF_Member_4_tags)
- /sizeof(asn_DEF_Member_4_tags[0]), /* 1 */
- asn_DEF_Member_4_tags, /* Same as above */
- sizeof(asn_DEF_Member_4_tags)
- /sizeof(asn_DEF_Member_4_tags[0]), /* 1 */
- asn_MBR_Member_4,
+ asn_DEF_Member_5_tags,
+ sizeof(asn_DEF_Member_5_tags)
+ /sizeof(asn_DEF_Member_5_tags[0]), /* 1 */
+ asn_DEF_Member_5_tags, /* Same as above */
+ sizeof(asn_DEF_Member_5_tags)
+ /sizeof(asn_DEF_Member_5_tags[0]), /* 1 */
+ asn_MBR_Member_5,
1, /* Elements count */
- &asn_SPC_Member_4_specs /* Additional specs */
+ &asn_SPC_Member_5_specs /* Additional specs */
};
-static asn_TYPE_member_t asn_MBR_anything_3[] = {
+static asn_TYPE_member_t asn_MBR_anything_4[] = {
{ ATF_NOFLAGS, 0, 0,
.tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
.tag_mode = 0,
- .type = (void *)&asn_DEF_Member_4,
+ .type = (void *)&asn_DEF_Member_5,
.memb_constraints = 0, /* Defer constraints checking to the member type */
.name = ""
},
};
-static ber_tlv_tag_t asn_DEF_anything_3_tags[] = {
+static ber_tlv_tag_t asn_DEF_anything_4_tags[] = {
(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
};
-static asn_SET_OF_specifics_t asn_SPC_anything_3_specs = {
+static asn_SET_OF_specifics_t asn_SPC_anything_4_specs = {
sizeof(struct anything),
offsetof(struct anything, _asn_ctx),
0, /* XER encoding is XMLDelimitedItemList */
};
static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_anything_3 = {
+asn_TYPE_descriptor_t asn_DEF_anything_4 = {
"anything",
"anything",
SET_OF_free,
@@ -347,18 +347,18 @@
SET_OF_decode_xer,
SET_OF_encode_xer,
0, /* Use generic outmost tag fetcher */
- asn_DEF_anything_3_tags,
- sizeof(asn_DEF_anything_3_tags)
- /sizeof(asn_DEF_anything_3_tags[0]) - 1, /* 1 */
- asn_DEF_anything_3_tags, /* Same as above */
- sizeof(asn_DEF_anything_3_tags)
- /sizeof(asn_DEF_anything_3_tags[0]), /* 2 */
- asn_MBR_anything_3,
+ asn_DEF_anything_4_tags,
+ sizeof(asn_DEF_anything_4_tags)
+ /sizeof(asn_DEF_anything_4_tags[0]) - 1, /* 1 */
+ asn_DEF_anything_4_tags, /* Same as above */
+ sizeof(asn_DEF_anything_4_tags)
+ /sizeof(asn_DEF_anything_4_tags[0]), /* 2 */
+ asn_MBR_anything_4,
1, /* Single element */
- &asn_SPC_anything_3_specs /* Additional specs */
+ &asn_SPC_anything_4_specs /* Additional specs */
};
-static asn_TYPE_member_t asn_MBR_other_5[] = {
+static asn_TYPE_member_t asn_MBR_other_9[] = {
{ ATF_NOFLAGS, 0, offsetof(struct other, choice.a),
.tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
.tag_mode = -1, /* IMPLICIT tag at current level */
@@ -374,21 +374,21 @@
.name = "b"
},
};
-static asn_TYPE_tag2member_t asn_MAP_other_5_tag2el[] = {
+static asn_TYPE_tag2member_t asn_MAP_other_9_tag2el[] = {
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* a at 26 */
{ (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 } /* b at 28 */
};
-static asn_CHOICE_specifics_t asn_SPC_other_5_specs = {
+static asn_CHOICE_specifics_t asn_SPC_other_9_specs = {
sizeof(struct other),
offsetof(struct other, _asn_ctx),
offsetof(struct other, present),
sizeof(((struct other *)0)->present),
- asn_MAP_other_5_tag2el,
+ asn_MAP_other_9_tag2el,
2, /* Count of tags in the map */
0 /* Whether extensible */
};
static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_other_5 = {
+asn_TYPE_descriptor_t asn_DEF_other_9 = {
"other",
"other",
CHOICE_free,
@@ -403,9 +403,9 @@
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- asn_MBR_other_5,
+ asn_MBR_other_9,
2, /* Elements count */
- &asn_SPC_other_5_specs /* Additional specs */
+ &asn_SPC_other_9_specs /* Additional specs */
};
static asn_TYPE_member_t asn_MBR_Stuff_1[] = {
@@ -419,14 +419,14 @@
{ ATF_POINTER, 2, offsetof(struct Stuff, anything),
.tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)),
.tag_mode = -1, /* IMPLICIT tag at current level */
- .type = (void *)&asn_DEF_anything_3,
+ .type = (void *)&asn_DEF_anything_4,
.memb_constraints = 0, /* Defer constraints checking to the member type */
.name = "anything"
},
{ ATF_POINTER, 0, offsetof(struct Stuff, other),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
- .type = (void *)&asn_DEF_other_5,
+ .type = (void *)&asn_DEF_other_9,
.memb_constraints = 0, /* Defer constraints checking to the member type */
.name = "other"
},