Sync with 5.4.1

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

diff --git a/core/Octetstring.hh b/core/Octetstring.hh
index bb1428aab959c1ec59bddc6c0cbeb1621c0eb737..20d4b73c1570ca4627a29cc01e8587bde30f4cb5 100644 (file)
--- a/core/Octetstring.hh
+++ b/core/Octetstring.hh
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2000-2014 Ericsson Telecom AB
+// Copyright (c) 2000-2015 Ericsson Telecom AB
 // All rights reserved. This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v1.0
 // which accompanies this distribution, and is available at
@@ -113,6 +113,7 @@ public:
 
   void log() const;
   void set_param(Module_Param& param);
+  Module_Param* get_param(Module_Param_Name& param_name) const;
 
   void encode_text(Text_Buf& text_buf) const;
   void decode_text(Text_Buf& text_buf);
@@ -249,7 +250,7 @@ public:
   const OCTETSTRING_ELEMENT operator[](int index_value) const;
   const OCTETSTRING_ELEMENT operator[](const INTEGER& index_value) const;
 
-  boolean match(const OCTETSTRING& other_value) const;
+  boolean match(const OCTETSTRING& other_value, boolean legacy = FALSE) const;
   const OCTETSTRING& valueof() const;
 
   int lengthof() const;
@@ -258,25 +259,26 @@ public:
   OCTETSTRING_template& list_item(unsigned int list_index);
 
   void log() const;
-  void log_match(const OCTETSTRING& match_value) const;
+  void log_match(const OCTETSTRING& match_value, boolean legacy = FALSE) const;
 
   void set_param(Module_Param& param);
+  Module_Param* get_param(Module_Param_Name& param_name) const;
 
   void encode_text(Text_Buf& text_buf) const;
   void decode_text(Text_Buf& text_buf);
 
-  boolean is_present() const;
-  boolean match_omit() const;
+  boolean is_present(boolean legacy = FALSE) const;
+  boolean match_omit(boolean legacy = FALSE) const;
 #ifdef TITAN_RUNTIME_2
   void valueofv(Base_Type* value) const { *(static_cast<OCTETSTRING*>(value)) = valueof(); }
   void set_value(template_sel other_value) { *this = other_value; }
   void copy_value(const Base_Type* other_value) { *this = *(static_cast<const OCTETSTRING*>(other_value)); }
   Base_Template* clone() const { return new OCTETSTRING_template(*this); }
   const TTCN_Typedescriptor_t* get_descriptor() const { return &OCTETSTRING_descr_; }
-  boolean matchv(const Base_Type* other_value) const { return match(*(static_cast<const OCTETSTRING*>(other_value))); }
-  void log_matchv(const Base_Type* match_value) const  { log_match(*(static_cast<const OCTETSTRING*>(match_value))); }
+  boolean matchv(const Base_Type* other_value, boolean legacy) const { return match(*(static_cast<const OCTETSTRING*>(other_value)), legacy); }
+  void log_matchv(const Base_Type* match_value, boolean legacy) const  { log_match(*(static_cast<const OCTETSTRING*>(match_value)), legacy); }
 #else
-  void check_restriction(template_res t_res, const char* t_name=NULL) const;
+  void check_restriction(template_res t_res, const char* t_name=NULL, boolean legacy = FALSE) const;
 #endif
 };