Sync with 5.2.0

[deliverable/titan.core.git] / core / ASN_CharacterString.hh

diff --git a/core/ASN_CharacterString.hh b/core/ASN_CharacterString.hh
index 5e0c24b61fe2ed9dabd95fb076f266ecb8bea7ab..279bccc0a5809da4764b49e33cf338cdb2018f0c 100644 (file)
--- a/core/ASN_CharacterString.hh
+++ b/core/ASN_CharacterString.hh
@@ -86,9 +86,9 @@ public:
   ASN_BER_TLV_t* BER_encode_TLV(const TTCN_Typedescriptor_t& p_td, unsigned p_coding) const;
   boolean BER_decode_TLV(const TTCN_Typedescriptor_t& p_td, const ASN_BER_TLV_t& p_tlv, unsigned L_form);
   int XER_encode(const XERdescriptor_t& p_td,
-                 TTCN_Buffer& p_buf, unsigned int flavor, int indent) const;
+                 TTCN_Buffer& p_buf, unsigned int flavor, int indent, embed_values_enc_struct_t*) const;
   int XER_decode(const XERdescriptor_t& p_td,
-                 XmlReaderWrap& reader, unsigned int flavor);
+                 XmlReaderWrap& reader, unsigned int flavor, embed_values_dec_struct_t*);
 private:
   boolean BER_decode_set_selection(const ASN_BER_TLV_t& p_tlv);
 public:
@@ -208,9 +208,9 @@ public:
   ASN_BER_TLV_t* BER_encode_TLV(const TTCN_Typedescriptor_t& p_td, unsigned p_coding) const;
   boolean BER_decode_TLV(const TTCN_Typedescriptor_t& p_td, const ASN_BER_TLV_t& p_tlv, unsigned L_form);
   int XER_encode(const XERdescriptor_t& p_td,
-                 TTCN_Buffer& p_buf, unsigned int flavor, int indent) const;
+                 TTCN_Buffer& p_buf, unsigned int flavor, int indent, embed_values_enc_struct_t*) const;
   int XER_decode(const XERdescriptor_t& p_td,
-                 XmlReaderWrap& reader, unsigned int flavor);
+                 XmlReaderWrap& reader, unsigned int flavor, embed_values_dec_struct_t*);
 };
 
 class CHARACTER_STRING_identification_syntaxes_template : public Base_Template {
@@ -315,9 +315,9 @@ public:
   ASN_BER_TLV_t* BER_encode_TLV(const TTCN_Typedescriptor_t& p_td, unsigned p_coding) const;
   boolean BER_decode_TLV(const TTCN_Typedescriptor_t& p_td, const ASN_BER_TLV_t& p_tlv, unsigned L_form);
   int XER_encode(const XERdescriptor_t& p_td,
-                 TTCN_Buffer& p_buf, unsigned int flavor, int indent) const;
+                 TTCN_Buffer& p_buf, unsigned int flavor, int indent, embed_values_enc_struct_t*) const;
   int XER_decode(const XERdescriptor_t& p_td,
-                 XmlReaderWrap& reader, unsigned int flavor);
+                 XmlReaderWrap& reader, unsigned int flavor, embed_values_dec_struct_t*);
 };
 
 class CHARACTER_STRING_identification_context__negotiation_template : public Base_Template {
@@ -430,8 +430,8 @@ public:
   void decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& p_buf, TTCN_EncDec::coding_t p_coding, ...);
   ASN_BER_TLV_t* BER_encode_TLV(const TTCN_Typedescriptor_t& p_td, unsigned p_coding) const;
   boolean BER_decode_TLV(const TTCN_Typedescriptor_t& p_td, const ASN_BER_TLV_t& p_tlv, unsigned L_form);
-  int XER_encode(const XERdescriptor_t&, TTCN_Buffer&, unsigned int, int) const;
-  int XER_decode(const XERdescriptor_t&, XmlReaderWrap& reader, unsigned int);
+  int XER_encode(const XERdescriptor_t&, TTCN_Buffer&, unsigned int, int, embed_values_enc_struct_t*) const;
+  int XER_decode(const XERdescriptor_t&, XmlReaderWrap& reader, unsigned int, embed_values_dec_struct_t*);
 };
 
 class CHARACTER_STRING_template : public Base_Template {