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

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/69-reserved-words-OK.asn1.-P b/tests/69-reserved-words-OK.asn1.-P
index 9f222eb4..96bf9515 100644
--- a/tests/69-reserved-words-OK.asn1.-P
+++ b/tests/69-reserved-words-OK.asn1.-P
@@ -75,27 +75,27 @@ memb_char_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 
 /*** <<< STAT-DEFS [T] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_class_2_tags[] = {
+static ber_tlv_tag_t asn_DEF_class_4_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_class_2_tag2el[] = {
+static asn_TYPE_tag2member_t asn_MAP_class_4_tag2el[] = {
 };
-static uint8_t asn_MAP_class_2_mmap[(0 + (8 * sizeof(unsigned int)) - 1) / 8] = {
+static uint8_t asn_MAP_class_4_mmap[(0 + (8 * sizeof(unsigned int)) - 1) / 8] = {
 	0
 };
-static asn_SET_specifics_t asn_SPC_class_2_specs = {
+static asn_SET_specifics_t asn_SPC_class_4_specs = {
 	sizeof(struct Class),
 	offsetof(struct Class, _asn_ctx),
 	offsetof(struct Class, _presence_map),
-	asn_MAP_class_2_tag2el,
+	asn_MAP_class_4_tag2el,
 	0,	/* Count of tags in the map */
-	asn_MAP_class_2_tag2el,	/* Same as above */
+	asn_MAP_class_4_tag2el,	/* Same as above */
 	0,	/* Count of tags in the CXER map */
 	1,	/* Whether extensible */
-	(unsigned int *)asn_MAP_class_2_mmap	/* Mandatory elements map */
+	(unsigned int *)asn_MAP_class_4_mmap	/* Mandatory elements map */
 };
 static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_class_2 = {
+asn_TYPE_descriptor_t asn_DEF_class_4 = {
 	"class",
 	"class",
 	SET_free,
@@ -106,14 +106,14 @@ asn_TYPE_descriptor_t asn_DEF_class_2 = {
 	SET_decode_xer,
 	SET_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_class_2_tags,
-	sizeof(asn_DEF_class_2_tags)
-		/sizeof(asn_DEF_class_2_tags[0]), /* 1 */
-	asn_DEF_class_2_tags,	/* Same as above */
-	sizeof(asn_DEF_class_2_tags)
-		/sizeof(asn_DEF_class_2_tags[0]), /* 1 */
+	asn_DEF_class_4_tags,
+	sizeof(asn_DEF_class_4_tags)
+		/sizeof(asn_DEF_class_4_tags[0]), /* 1 */
+	asn_DEF_class_4_tags,	/* Same as above */
+	sizeof(asn_DEF_class_4_tags)
+		/sizeof(asn_DEF_class_4_tags[0]), /* 1 */
 	0, 0,	/* No members */
-	&asn_SPC_class_2_specs	/* Additional specs */
+	&asn_SPC_class_4_specs	/* Additional specs */
 };
 
 static asn_TYPE_member_t asn_MBR_T_1[] = {
@@ -134,7 +134,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct T, Class),
 		.tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)),
 		.tag_mode = 0,
-		.type = (void *)&asn_DEF_class_2,
+		.type = (void *)&asn_DEF_class_4,
 		.memb_constraints = 0,	/* Defer constraints checking to the member type */
 		.name = "class"
 		},