Skip to content
Snippets Groups Projects
Commit abffe12b authored by Botond Baranyi's avatar Botond Baranyi
Browse files

Removed unused type conversion functions and fixed some other warnings


Signed-off-by: default avatarBotond Baranyi <botond.baranyi@ericsson.com>
parent 1c3d1b1e
No related branches found
No related tags found
1 merge request!506Removed unused type conversion functions and fixed some other warnings
......@@ -5106,7 +5106,7 @@ namespace Common {
TypeChain l_chain1, l_chain2;
TypeChain r_chain1, r_chain2;
bool compat_t1 = t1->is_compatible(t2, &info1, this, &l_chain1, &r_chain1);
bool compat_t2 = t2->is_compatible(t1, &info2, NULL, &l_chain2, &r_chain2);
bool compat_t2 = !compat_t1 ? t2->is_compatible(t1, &info2, NULL, &l_chain2, &r_chain2) : true;
if (!compat_t1 && !compat_t2) {
if (v1->is_ref()) {
CompField* def_alt = t1->get_default_alternative();
......
......@@ -580,10 +580,11 @@ void defEnumClass(const enum_def *edef, output_struct *output)
use_runtime_2 ? "m_p->" : "param.", use_runtime_2 ? "m_p->" : "param.", dispname);
if (use_runtime_2) {
def = mputprintf(def, "static int* get_int_for_param(%s enum_par);\n", enum_type);
def = mputprintf(def, "static int* get_int_for_param(%s %s);\n",
enum_type, edef->elements[i].hasMultipleValues ? "enum_par" : "");
src = mputprintf(src,
"int* %s::get_int_for_param(%s enum_par)\n"
"{\n", name, enum_type);
"int* %s::get_int_for_param(%s %s)\n"
"{\n", name, enum_type, edef->elements[i].hasMultipleValues ? "enum_par" : "");
for (i = 0; i < edef->nElements; i++) {
if (edef->elements[i].hasMultipleValues) {
src = generate_enum_values_if_stmt_ef(src, edef->elements + i, "enum_par");
......
......@@ -19,6 +19,12 @@
#include <string.h>
#include "../common/memory.h"
ASN_ANY& ASN_ANY::operator=(const ASN_ANY& other_value)
{
OCTETSTRING::operator=(other_value);
return *this;
}
void ASN_ANY::encode(const TTCN_Typedescriptor_t& p_td,
TTCN_Buffer& p_buf,
int p_coding, ...) const
......
......@@ -29,6 +29,8 @@ public:
: OCTETSTRING(other_value) {}
ASN_ANY(const ASN_ANY& other_value)
: OCTETSTRING(other_value) {}
ASN_ANY& operator=(const ASN_ANY& other_value);
#ifdef TITAN_RUNTIME_2
void set_value(const Base_Type* other_value) { *this = *(static_cast<const ASN_ANY*>(other_value)); }
......
......@@ -1022,7 +1022,7 @@ public:
virtual const default_struct* get_default_indexes() const { return NULL; }
/** return whether a field is considered sensitive data for logging */
virtual boolean fld_sensitive(int field_index) const { return FALSE; }
virtual boolean fld_sensitive(int) const { return FALSE; }
/** override if it's TRUE for the specific type (if sdef->opentype_outermost) */
virtual boolean is_opentype_outermost() const { return FALSE; }
......
......@@ -489,7 +489,7 @@ public:
virtual ~EXCEPTION_BASE() { }
CHARSTRING get_log() const { return exception_log; }
virtual boolean is_class() const { return FALSE; }
virtual boolean is_type(const char* p_type_name) const { return FALSE; }
virtual boolean is_type(const char*) const { return FALSE; }
virtual OBJECT* get_object() const { return NULL; }
virtual OBJECT_REF<OBJECT> get_object_ref() { return OBJECT_REF<OBJECT>(); }
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment