clang warning elimination2

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

diff --git a/core/Integer.hh b/core/Integer.hh
index bf6ec359cb3434cef518e310ed897a3cf41421f5..f35bab31c18d2bc8c359340d5f0e10d46e19123c 100644 (file)
--- a/core/Integer.hh
+++ b/core/Integer.hh
@@ -1,10 +1,25 @@
-///////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2000-2014 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
-// http://www.eclipse.org/legal/epl-v10.html
-///////////////////////////////////////////////////////////////////////////////
+/******************************************************************************
+ * Copyright (c) 2000-2016 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Balasko, Jeno
+ *   Baranyi, Botond
+ *   Beres, Szabolcs
+ *   Delic, Adam
+ *   Forstner, Matyas
+ *   Kovacs, Ferenc
+ *   Raduly, Csaba
+ *   Szabados, Kristof
+ *   Szabo, Bence Janos
+ *   Szabo, Janos Zoltan – initial implementation
+ *   Szalai, Gabor
+ *   Tatarka, Gabor
+ *
+ ******************************************************************************/
 #ifndef INTEGER_HH
 #define INTEGER_HH
 
@@ -129,6 +144,7 @@ public:
 #endif
 
   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);
 
@@ -165,7 +181,7 @@ public:
   /** @brief Decode according to XML Encoding Rules.
    **/
   int XER_decode(const XERdescriptor_t& p_td, XmlReaderWrap& reader,
-                 unsigned int flavor, embed_values_dec_struct_t*);
+                 unsigned int flavor, unsigned int flavor2, embed_values_dec_struct_t*);
   
   /** Encodes accordingly to the JSON encoding rules.
     * Returns the length of the encoded data. */
@@ -256,8 +272,8 @@ public:
   INTEGER_template& operator=(const OPTIONAL<INTEGER>& other_value);
   INTEGER_template& operator=(const INTEGER_template& other_value);
 
-  boolean match(int other_value) const;
-  boolean match(const INTEGER& other_value) const;
+  boolean match(int other_value, boolean legacy = FALSE) const;
+  boolean match(const INTEGER& other_value, boolean legacy = FALSE) const;
   INTEGER valueof() const;
 
   /** Sets the template type.
@@ -307,15 +323,16 @@ public:
   void set_max(const INTEGER& max_value);
 
   void log() const;
-  void log_match(const INTEGER& match_value) const;
+  void log_match(const INTEGER& 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<INTEGER*>(value)) = valueof(); }
@@ -323,10 +340,10 @@ public:
   void copy_value(const Base_Type* other_value) { *this = *(static_cast<const INTEGER*>(other_value)); }
   Base_Template* clone() const { return new INTEGER_template(*this); }
   const TTCN_Typedescriptor_t* get_descriptor() const { return &INTEGER_descr_; }
-  boolean matchv(const Base_Type* other_value) const { return match(*(static_cast<const INTEGER*>(other_value))); }
-  void log_matchv(const Base_Type* match_value) const  { log_match(*(static_cast<const INTEGER*>(match_value))); }
+  boolean matchv(const Base_Type* other_value, boolean legacy) const { return match(*(static_cast<const INTEGER*>(other_value)), legacy); }
+  void log_matchv(const Base_Type* match_value, boolean legacy) const  { log_match(*(static_cast<const INTEGER*>(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
 };