fixed name clash in constraint checking code; also changed braces to double quote in #includes

1 files changed, 101 insertions, 101 deletions

diff --git a/tests/65-multi-tag-OK.asn1.-Pfnative-types b/tests/65-multi-tag-OK.asn1.-Pfnative-types
index c82a75b8..64c95f3b 100644
--- a/tests/65-multi-tag-OK.asn1.-Pfnative-types
+++ b/tests/65-multi-tag-OK.asn1.-Pfnative-types
@@ -33,7 +33,7 @@ T1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 static void
-T1_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+T1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 	td->free_struct    = asn_DEF_T2.free_struct;
 	td->print_struct   = asn_DEF_T2.print_struct;
 	td->ber_decoder    = asn_DEF_T2.ber_decoder;
@@ -48,21 +48,21 @@ T1_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 void
 T1_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
-	T1_0_inherit_TYPE_descriptor(td);
+	T1_1_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
 T1_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	T1_0_inherit_TYPE_descriptor(td);
+	T1_1_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 asn_dec_rval_t
 T1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
-	T1_0_inherit_TYPE_descriptor(td);
+	T1_1_inherit_TYPE_descriptor(td);
 	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
@@ -70,14 +70,14 @@ asn_enc_rval_t
 T1_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T1_0_inherit_TYPE_descriptor(td);
+	T1_1_inherit_TYPE_descriptor(td);
 	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
 }
 
 asn_dec_rval_t
 T1_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, const char *opt_mname, void *bufptr, size_t size) {
-	T1_0_inherit_TYPE_descriptor(td);
+	T1_1_inherit_TYPE_descriptor(td);
 	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
 }
 
@@ -85,20 +85,20 @@ asn_enc_rval_t
 T1_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T1_0_inherit_TYPE_descriptor(td);
+	T1_1_inherit_TYPE_descriptor(td);
 	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
 }
 
 
 /*** <<< STAT-DEFS [T1] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_T1_0_tags[] = {
+static ber_tlv_tag_t asn_DEF_T1_1_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (6 << 2))
 };
-static ber_tlv_tag_t asn_DEF_T1_0_all_tags[] = {
+static ber_tlv_tag_t asn_DEF_T1_1_all_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
@@ -117,12 +117,12 @@ asn_TYPE_descriptor_t asn_DEF_T1 = {
 	T1_decode_xer,
 	T1_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_T1_0_tags,
-	sizeof(asn_DEF_T1_0_tags)
-		/sizeof(asn_DEF_T1_0_tags[0]), /* 4 */
-	asn_DEF_T1_0_all_tags,
-	sizeof(asn_DEF_T1_0_all_tags)
-		/sizeof(asn_DEF_T1_0_all_tags[0]), /* 6 */
+	asn_DEF_T1_1_tags,
+	sizeof(asn_DEF_T1_1_tags)
+		/sizeof(asn_DEF_T1_1_tags[0]), /* 4 */
+	asn_DEF_T1_1_all_tags,
+	sizeof(asn_DEF_T1_1_all_tags)
+		/sizeof(asn_DEF_T1_1_all_tags[0]), /* 6 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -162,7 +162,7 @@ T2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 static void
-T2_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+T2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 	td->free_struct    = asn_DEF_T3.free_struct;
 	td->print_struct   = asn_DEF_T3.print_struct;
 	td->ber_decoder    = asn_DEF_T3.ber_decoder;
@@ -177,21 +177,21 @@ T2_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 void
 T2_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
-	T2_0_inherit_TYPE_descriptor(td);
+	T2_1_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
 T2_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	T2_0_inherit_TYPE_descriptor(td);
+	T2_1_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 asn_dec_rval_t
 T2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
-	T2_0_inherit_TYPE_descriptor(td);
+	T2_1_inherit_TYPE_descriptor(td);
 	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
@@ -199,14 +199,14 @@ asn_enc_rval_t
 T2_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T2_0_inherit_TYPE_descriptor(td);
+	T2_1_inherit_TYPE_descriptor(td);
 	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
 }
 
 asn_dec_rval_t
 T2_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, const char *opt_mname, void *bufptr, size_t size) {
-	T2_0_inherit_TYPE_descriptor(td);
+	T2_1_inherit_TYPE_descriptor(td);
 	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
 }
 
@@ -214,19 +214,19 @@ asn_enc_rval_t
 T2_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T2_0_inherit_TYPE_descriptor(td);
+	T2_1_inherit_TYPE_descriptor(td);
 	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
 }
 
 
 /*** <<< STAT-DEFS [T2] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_T2_0_tags[] = {
+static ber_tlv_tag_t asn_DEF_T2_1_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (6 << 2))
 };
-static ber_tlv_tag_t asn_DEF_T2_0_all_tags[] = {
+static ber_tlv_tag_t asn_DEF_T2_1_all_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
@@ -244,12 +244,12 @@ asn_TYPE_descriptor_t asn_DEF_T2 = {
 	T2_decode_xer,
 	T2_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_T2_0_tags,
-	sizeof(asn_DEF_T2_0_tags)
-		/sizeof(asn_DEF_T2_0_tags[0]), /* 3 */
-	asn_DEF_T2_0_all_tags,
-	sizeof(asn_DEF_T2_0_all_tags)
-		/sizeof(asn_DEF_T2_0_all_tags[0]), /* 5 */
+	asn_DEF_T2_1_tags,
+	sizeof(asn_DEF_T2_1_tags)
+		/sizeof(asn_DEF_T2_1_tags[0]), /* 3 */
+	asn_DEF_T2_1_all_tags,
+	sizeof(asn_DEF_T2_1_all_tags)
+		/sizeof(asn_DEF_T2_1_all_tags[0]), /* 5 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -289,7 +289,7 @@ T3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 static void
-T3_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+T3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 	td->free_struct    = asn_DEF_T4.free_struct;
 	td->print_struct   = asn_DEF_T4.print_struct;
 	td->ber_decoder    = asn_DEF_T4.ber_decoder;
@@ -304,21 +304,21 @@ T3_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 void
 T3_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
-	T3_0_inherit_TYPE_descriptor(td);
+	T3_1_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
 T3_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	T3_0_inherit_TYPE_descriptor(td);
+	T3_1_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 asn_dec_rval_t
 T3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
-	T3_0_inherit_TYPE_descriptor(td);
+	T3_1_inherit_TYPE_descriptor(td);
 	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
@@ -326,14 +326,14 @@ asn_enc_rval_t
 T3_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T3_0_inherit_TYPE_descriptor(td);
+	T3_1_inherit_TYPE_descriptor(td);
 	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
 }
 
 asn_dec_rval_t
 T3_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, const char *opt_mname, void *bufptr, size_t size) {
-	T3_0_inherit_TYPE_descriptor(td);
+	T3_1_inherit_TYPE_descriptor(td);
 	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
 }
 
@@ -341,18 +341,18 @@ asn_enc_rval_t
 T3_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T3_0_inherit_TYPE_descriptor(td);
+	T3_1_inherit_TYPE_descriptor(td);
 	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
 }
 
 
 /*** <<< STAT-DEFS [T3] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_T3_0_tags[] = {
+static ber_tlv_tag_t asn_DEF_T3_1_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (6 << 2))
 };
-static ber_tlv_tag_t asn_DEF_T3_0_all_tags[] = {
+static ber_tlv_tag_t asn_DEF_T3_1_all_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (6 << 2)),
@@ -369,12 +369,12 @@ asn_TYPE_descriptor_t asn_DEF_T3 = {
 	T3_decode_xer,
 	T3_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_T3_0_tags,
-	sizeof(asn_DEF_T3_0_tags)
-		/sizeof(asn_DEF_T3_0_tags[0]), /* 2 */
-	asn_DEF_T3_0_all_tags,
-	sizeof(asn_DEF_T3_0_all_tags)
-		/sizeof(asn_DEF_T3_0_all_tags[0]), /* 4 */
+	asn_DEF_T3_1_tags,
+	sizeof(asn_DEF_T3_1_tags)
+		/sizeof(asn_DEF_T3_1_tags[0]), /* 2 */
+	asn_DEF_T3_1_all_tags,
+	sizeof(asn_DEF_T3_1_all_tags)
+		/sizeof(asn_DEF_T3_1_all_tags[0]), /* 4 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -414,7 +414,7 @@ T4_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 static void
-T4_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+T4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 	td->free_struct    = asn_DEF_T5.free_struct;
 	td->print_struct   = asn_DEF_T5.print_struct;
 	td->ber_decoder    = asn_DEF_T5.ber_decoder;
@@ -429,21 +429,21 @@ T4_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 void
 T4_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
-	T4_0_inherit_TYPE_descriptor(td);
+	T4_1_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
 T4_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	T4_0_inherit_TYPE_descriptor(td);
+	T4_1_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 asn_dec_rval_t
 T4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
-	T4_0_inherit_TYPE_descriptor(td);
+	T4_1_inherit_TYPE_descriptor(td);
 	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
@@ -451,14 +451,14 @@ asn_enc_rval_t
 T4_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T4_0_inherit_TYPE_descriptor(td);
+	T4_1_inherit_TYPE_descriptor(td);
 	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
 }
 
 asn_dec_rval_t
 T4_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, const char *opt_mname, void *bufptr, size_t size) {
-	T4_0_inherit_TYPE_descriptor(td);
+	T4_1_inherit_TYPE_descriptor(td);
 	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
 }
 
@@ -466,14 +466,14 @@ asn_enc_rval_t
 T4_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T4_0_inherit_TYPE_descriptor(td);
+	T4_1_inherit_TYPE_descriptor(td);
 	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
 }
 
 
 /*** <<< STAT-DEFS [T4] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_T4_0_tags[] = {
+static ber_tlv_tag_t asn_DEF_T4_1_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (6 << 2)),
 	(ASN_TAG_CLASS_UNIVERSAL | (9 << 2))
@@ -489,12 +489,12 @@ asn_TYPE_descriptor_t asn_DEF_T4 = {
 	T4_decode_xer,
 	T4_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_T4_0_tags,
-	sizeof(asn_DEF_T4_0_tags)
-		/sizeof(asn_DEF_T4_0_tags[0]) - 1, /* 2 */
-	asn_DEF_T4_0_tags,	/* Same as above */
-	sizeof(asn_DEF_T4_0_tags)
-		/sizeof(asn_DEF_T4_0_tags[0]), /* 3 */
+	asn_DEF_T4_1_tags,
+	sizeof(asn_DEF_T4_1_tags)
+		/sizeof(asn_DEF_T4_1_tags[0]) - 1, /* 2 */
+	asn_DEF_T4_1_tags,	/* Same as above */
+	sizeof(asn_DEF_T4_1_tags)
+		/sizeof(asn_DEF_T4_1_tags[0]), /* 3 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -534,7 +534,7 @@ T5_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 static void
-T5_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+T5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 	td->free_struct    = asn_DEF_T6.free_struct;
 	td->print_struct   = asn_DEF_T6.print_struct;
 	td->ber_decoder    = asn_DEF_T6.ber_decoder;
@@ -549,21 +549,21 @@ T5_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 void
 T5_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
-	T5_0_inherit_TYPE_descriptor(td);
+	T5_1_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
 T5_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	T5_0_inherit_TYPE_descriptor(td);
+	T5_1_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 asn_dec_rval_t
 T5_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
-	T5_0_inherit_TYPE_descriptor(td);
+	T5_1_inherit_TYPE_descriptor(td);
 	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
@@ -571,14 +571,14 @@ asn_enc_rval_t
 T5_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T5_0_inherit_TYPE_descriptor(td);
+	T5_1_inherit_TYPE_descriptor(td);
 	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
 }
 
 asn_dec_rval_t
 T5_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, const char *opt_mname, void *bufptr, size_t size) {
-	T5_0_inherit_TYPE_descriptor(td);
+	T5_1_inherit_TYPE_descriptor(td);
 	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
 }
 
@@ -586,14 +586,14 @@ asn_enc_rval_t
 T5_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T5_0_inherit_TYPE_descriptor(td);
+	T5_1_inherit_TYPE_descriptor(td);
 	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
 }
 
 
 /*** <<< STAT-DEFS [T5] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_T5_0_tags[] = {
+static ber_tlv_tag_t asn_DEF_T5_1_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (6 << 2)),
 	(ASN_TAG_CLASS_UNIVERSAL | (9 << 2))
 };
@@ -608,12 +608,12 @@ asn_TYPE_descriptor_t asn_DEF_T5 = {
 	T5_decode_xer,
 	T5_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_T5_0_tags,
-	sizeof(asn_DEF_T5_0_tags)
-		/sizeof(asn_DEF_T5_0_tags[0]) - 1, /* 1 */
-	asn_DEF_T5_0_tags,	/* Same as above */
-	sizeof(asn_DEF_T5_0_tags)
-		/sizeof(asn_DEF_T5_0_tags[0]), /* 2 */
+	asn_DEF_T5_1_tags,
+	sizeof(asn_DEF_T5_1_tags)
+		/sizeof(asn_DEF_T5_1_tags[0]) - 1, /* 1 */
+	asn_DEF_T5_1_tags,	/* Same as above */
+	sizeof(asn_DEF_T5_1_tags)
+		/sizeof(asn_DEF_T5_1_tags[0]), /* 2 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -653,7 +653,7 @@ T6_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 static void
-T6_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+T6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 	td->free_struct    = asn_DEF_NativeReal.free_struct;
 	td->print_struct   = asn_DEF_NativeReal.print_struct;
 	td->ber_decoder    = asn_DEF_NativeReal.ber_decoder;
@@ -668,21 +668,21 @@ T6_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 void
 T6_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
-	T6_0_inherit_TYPE_descriptor(td);
+	T6_1_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
 T6_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	T6_0_inherit_TYPE_descriptor(td);
+	T6_1_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 asn_dec_rval_t
 T6_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
-	T6_0_inherit_TYPE_descriptor(td);
+	T6_1_inherit_TYPE_descriptor(td);
 	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
@@ -690,14 +690,14 @@ asn_enc_rval_t
 T6_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T6_0_inherit_TYPE_descriptor(td);
+	T6_1_inherit_TYPE_descriptor(td);
 	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
 }
 
 asn_dec_rval_t
 T6_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, const char *opt_mname, void *bufptr, size_t size) {
-	T6_0_inherit_TYPE_descriptor(td);
+	T6_1_inherit_TYPE_descriptor(td);
 	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
 }
 
@@ -705,14 +705,14 @@ asn_enc_rval_t
 T6_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T6_0_inherit_TYPE_descriptor(td);
+	T6_1_inherit_TYPE_descriptor(td);
 	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
 }
 
 
 /*** <<< STAT-DEFS [T6] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_T6_0_tags[] = {
+static ber_tlv_tag_t asn_DEF_T6_1_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (9 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_T6 = {
@@ -726,12 +726,12 @@ asn_TYPE_descriptor_t asn_DEF_T6 = {
 	T6_decode_xer,
 	T6_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_T6_0_tags,
-	sizeof(asn_DEF_T6_0_tags)
-		/sizeof(asn_DEF_T6_0_tags[0]), /* 1 */
-	asn_DEF_T6_0_tags,	/* Same as above */
-	sizeof(asn_DEF_T6_0_tags)
-		/sizeof(asn_DEF_T6_0_tags[0]), /* 1 */
+	asn_DEF_T6_1_tags,
+	sizeof(asn_DEF_T6_1_tags)
+		/sizeof(asn_DEF_T6_1_tags[0]), /* 1 */
+	asn_DEF_T6_1_tags,	/* Same as above */
+	sizeof(asn_DEF_T6_1_tags)
+		/sizeof(asn_DEF_T6_1_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -771,7 +771,7 @@ T_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 static void
-T_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 	td->free_struct    = asn_DEF_Ts.free_struct;
 	td->print_struct   = asn_DEF_Ts.print_struct;
 	td->ber_decoder    = asn_DEF_Ts.ber_decoder;
@@ -786,21 +786,21 @@ T_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 void
 T_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
-	T_0_inherit_TYPE_descriptor(td);
+	T_1_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
 T_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	T_0_inherit_TYPE_descriptor(td);
+	T_1_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 asn_dec_rval_t
 T_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
-	T_0_inherit_TYPE_descriptor(td);
+	T_1_inherit_TYPE_descriptor(td);
 	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
@@ -808,14 +808,14 @@ asn_enc_rval_t
 T_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T_0_inherit_TYPE_descriptor(td);
+	T_1_inherit_TYPE_descriptor(td);
 	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
 }
 
 asn_dec_rval_t
 T_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, const char *opt_mname, void *bufptr, size_t size) {
-	T_0_inherit_TYPE_descriptor(td);
+	T_1_inherit_TYPE_descriptor(td);
 	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
 }
 
@@ -823,14 +823,14 @@ asn_enc_rval_t
 T_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
-	T_0_inherit_TYPE_descriptor(td);
+	T_1_inherit_TYPE_descriptor(td);
 	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
 }
 
 
 /*** <<< STAT-DEFS [T] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_T_0_tags[] = {
+static ber_tlv_tag_t asn_DEF_T_1_tags[] = {
 	(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 	(ASN_TAG_CLASS_CONTEXT | (123 << 2)),
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
@@ -846,12 +846,12 @@ asn_TYPE_descriptor_t asn_DEF_T = {
 	T_decode_xer,
 	T_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_T_0_tags,
-	sizeof(asn_DEF_T_0_tags)
-		/sizeof(asn_DEF_T_0_tags[0]) - 2, /* 1 */
-	asn_DEF_T_0_tags,	/* Same as above */
-	sizeof(asn_DEF_T_0_tags)
-		/sizeof(asn_DEF_T_0_tags[0]), /* 3 */
+	asn_DEF_T_1_tags,
+	sizeof(asn_DEF_T_1_tags)
+		/sizeof(asn_DEF_T_1_tags[0]) - 2, /* 1 */
+	asn_DEF_T_1_tags,	/* Same as above */
+	sizeof(asn_DEF_T_1_tags)
+		/sizeof(asn_DEF_T_1_tags[0]), /* 3 */
 	0, 0,	/* Defined elsewhere */
 	0	/* No specifics */
 };