Sync with 5.2.0

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

diff --git a/core/Objid.hh b/core/Objid.hh
index c5828b55c80374c8d82387e7e75f179c03083dad..b2b7489c94e37a2034123508f8fb74ae582deb4e 100644 (file)
--- a/core/Objid.hh
+++ b/core/Objid.hh
@@ -27,6 +27,10 @@ class OBJID : public Base_Type {
 
   void init_struct(int n_components);
   void copy_value();
+  
+  /** Initializes the object identifier with a string containing the components
+    * separated by dots. */
+  void from_string(char* p_str);
 
 public:
   typedef unsigned int objid_element;
@@ -83,9 +87,17 @@ public:
   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);
+                 unsigned int flavor, embed_values_dec_struct_t*);
+  
+  /** Encodes accordingly to the JSON encoding rules.
+    * Returns the length of the encoded data. */
+  int JSON_encode(const TTCN_Typedescriptor_t&, JSON_Tokenizer&) const;
+  
+  /** Decodes accordingly to the JSON decoding rules.
+    * Returns the length of the encoded data. */
+  int JSON_decode(const TTCN_Typedescriptor_t&, JSON_Tokenizer&, boolean);
 };
 
 // objid template class