diff --git a/src/expression.class b/src/expression.class index 9c11d39db..64c9a2e70 100644 --- a/src/expression.class +++ b/src/expression.class @@ -1,20 +1,14 @@ typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void init(grib_expression* e); -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); -static string get_name(grib_expression* e); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); -static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); +static void init(grib_expression* e); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static string get_name(grib_expression* e); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); +static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); typedef struct grib_expression_NAME{ grib_expression base; @@ -28,7 +22,6 @@ static grib_expression_class _grib_expression_class_NAME = { "NAME", /* name */ sizeof(grib_expression_NAME),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ &init, /* constructor */ &destroy, /* destructor */ &print, @@ -44,8 +37,3 @@ grib_expression_class* grib_expression_class_NAME = &_grib_expression_class_NAME ADD_TO_FILE grib_expression_class.h extern grib_expression_class* grib_expression_class_NAME; ADD_TO_FILE grib_expression_factory.h { "NAME", &grib_expression_class_NAME, }, - -static void init_class(grib_expression_class* c) -{ -INIT -} diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h index 7f0398065..e54b76615 100644 --- a/src/grib_api_internal.h +++ b/src/grib_api_internal.h @@ -1086,7 +1086,6 @@ struct grib_expression_class size_t size; int inited; - expression_class_init_proc init_class; expression_init_proc init; expression_destroy_proc destroy; diff --git a/src/grib_expression_class_accessor.cc b/src/grib_expression_class_accessor.cc index 67ffbea9a..39fe4f109 100644 --- a/src/grib_expression_class_accessor.cc +++ b/src/grib_expression_class_accessor.cc @@ -41,20 +41,14 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); -static string get_name(grib_expression* e); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); -static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static string get_name(grib_expression* e); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); +static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); typedef struct grib_expression_accessor{ grib_expression base; @@ -70,7 +64,6 @@ static grib_expression_class _grib_expression_class_accessor = { "accessor", /* name */ sizeof(grib_expression_accessor),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -84,10 +77,6 @@ static grib_expression_class _grib_expression_class_accessor = { grib_expression_class* grib_expression_class_accessor = &_grib_expression_class_accessor; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static const char* get_name(grib_expression* g) diff --git a/src/grib_expression_class_binop.cc b/src/grib_expression_class_binop.cc index e95bebbd3..328bb2ac4 100644 --- a/src/grib_expression_class_binop.cc +++ b/src/grib_expression_class_binop.cc @@ -41,18 +41,12 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); typedef struct grib_expression_binop{ grib_expression base; @@ -70,7 +64,6 @@ static grib_expression_class _grib_expression_class_binop = { "binop", /* name */ sizeof(grib_expression_binop),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -84,10 +77,6 @@ static grib_expression_class _grib_expression_class_binop = { grib_expression_class* grib_expression_class_binop = &_grib_expression_class_binop; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres) diff --git a/src/grib_expression_class_double.cc b/src/grib_expression_class_double.cc index 0c0f87a16..89747194b 100644 --- a/src/grib_expression_class_double.cc +++ b/src/grib_expression_class_double.cc @@ -37,18 +37,12 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); typedef struct grib_expression_double{ grib_expression base; @@ -62,7 +56,6 @@ static grib_expression_class _grib_expression_class_double = { "double", /* name */ sizeof(grib_expression_double),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -76,10 +69,6 @@ static grib_expression_class _grib_expression_class_double = { grib_expression_class* grib_expression_class_double = &_grib_expression_class_double; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres) diff --git a/src/grib_expression_class_functor.cc b/src/grib_expression_class_functor.cc index 16153620d..4664def10 100644 --- a/src/grib_expression_class_functor.cc +++ b/src/grib_expression_class_functor.cc @@ -37,17 +37,11 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); typedef struct grib_expression_functor{ grib_expression base; @@ -62,7 +56,6 @@ static grib_expression_class _grib_expression_class_functor = { "functor", /* name */ sizeof(grib_expression_functor),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -76,10 +69,6 @@ static grib_expression_class _grib_expression_class_functor = { grib_expression_class* grib_expression_class_functor = &_grib_expression_class_functor; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres) diff --git a/src/grib_expression_class_is_in_dict.cc b/src/grib_expression_class_is_in_dict.cc index 27856cc2d..142287cdc 100644 --- a/src/grib_expression_class_is_in_dict.cc +++ b/src/grib_expression_class_is_in_dict.cc @@ -39,19 +39,13 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); -static string get_name(grib_expression* e); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); -static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static string get_name(grib_expression* e); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); +static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); typedef struct grib_expression_is_in_dict{ grib_expression base; @@ -66,7 +60,6 @@ static grib_expression_class _grib_expression_class_is_in_dict = { "is_in_dict", /* name */ sizeof(grib_expression_is_in_dict),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ 0, /* destructor */ &print, @@ -80,10 +73,6 @@ static grib_expression_class _grib_expression_class_is_in_dict = { grib_expression_class* grib_expression_class_is_in_dict = &_grib_expression_class_is_in_dict; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ diff --git a/src/grib_expression_class_is_in_list.cc b/src/grib_expression_class_is_in_list.cc index 46310bcd3..f5339c309 100644 --- a/src/grib_expression_class_is_in_list.cc +++ b/src/grib_expression_class_is_in_list.cc @@ -40,20 +40,14 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); -static string get_name(grib_expression* e); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); -static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static string get_name(grib_expression* e); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); +static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); typedef struct grib_expression_is_in_list{ grib_expression base; @@ -68,7 +62,6 @@ static grib_expression_class _grib_expression_class_is_in_list = { "is_in_list", /* name */ sizeof(grib_expression_is_in_list),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -82,10 +75,6 @@ static grib_expression_class _grib_expression_class_is_in_list = { grib_expression_class* grib_expression_class_is_in_list = &_grib_expression_class_is_in_list; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ diff --git a/src/grib_expression_class_is_integer.cc b/src/grib_expression_class_is_integer.cc index 460170e6e..e79f6c32c 100644 --- a/src/grib_expression_class_is_integer.cc +++ b/src/grib_expression_class_is_integer.cc @@ -41,20 +41,14 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); -static string get_name(grib_expression* e); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); -static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static string get_name(grib_expression* e); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); +static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); typedef struct grib_expression_is_integer{ grib_expression base; @@ -70,7 +64,6 @@ static grib_expression_class _grib_expression_class_is_integer = { "is_integer", /* name */ sizeof(grib_expression_is_integer),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -84,10 +77,6 @@ static grib_expression_class _grib_expression_class_is_integer = { grib_expression_class* grib_expression_class_is_integer = &_grib_expression_class_is_integer; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static const char* get_name(grib_expression* g) diff --git a/src/grib_expression_class_length.cc b/src/grib_expression_class_length.cc index 23ac0f591..c9e967c77 100644 --- a/src/grib_expression_class_length.cc +++ b/src/grib_expression_class_length.cc @@ -41,20 +41,14 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); -static string get_name(grib_expression* e); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); -static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static string get_name(grib_expression* e); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); +static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); typedef struct grib_expression_length{ grib_expression base; @@ -70,7 +64,6 @@ static grib_expression_class _grib_expression_class_length = { "length", /* name */ sizeof(grib_expression_length),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -84,10 +77,6 @@ static grib_expression_class _grib_expression_class_length = { grib_expression_class* grib_expression_class_length = &_grib_expression_class_length; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static const char* get_name(grib_expression* g) diff --git a/src/grib_expression_class_logical_and.cc b/src/grib_expression_class_logical_and.cc index 5cf98db69..9a25e54c1 100644 --- a/src/grib_expression_class_logical_and.cc +++ b/src/grib_expression_class_logical_and.cc @@ -15,7 +15,6 @@ START_CLASS_DEF CLASS = expression - IMPLEMENTS = init_class IMPLEMENTS = destroy IMPLEMENTS = native_type IMPLEMENTS = evaluate_long @@ -39,18 +38,12 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); typedef struct grib_expression_logical_and{ grib_expression base; @@ -65,7 +58,6 @@ static grib_expression_class _grib_expression_class_logical_and = { "logical_and", /* name */ sizeof(grib_expression_logical_and),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -79,10 +71,6 @@ static grib_expression_class _grib_expression_class_logical_and = { grib_expression_class* grib_expression_class_logical_and = &_grib_expression_class_logical_and; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres) diff --git a/src/grib_expression_class_logical_or.cc b/src/grib_expression_class_logical_or.cc index 75c2a6520..212ff3084 100644 --- a/src/grib_expression_class_logical_or.cc +++ b/src/grib_expression_class_logical_or.cc @@ -15,7 +15,6 @@ START_CLASS_DEF CLASS = expression - IMPLEMENTS = init_class IMPLEMENTS = destroy IMPLEMENTS = native_type IMPLEMENTS = evaluate_long @@ -39,18 +38,12 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); typedef struct grib_expression_logical_or{ grib_expression base; @@ -65,7 +58,6 @@ static grib_expression_class _grib_expression_class_logical_or = { "logical_or", /* name */ sizeof(grib_expression_logical_or),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -79,10 +71,6 @@ static grib_expression_class _grib_expression_class_logical_or = { grib_expression_class* grib_expression_class_logical_or = &_grib_expression_class_logical_or; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres) diff --git a/src/grib_expression_class_long.cc b/src/grib_expression_class_long.cc index e2c43b9ce..3b61a83d1 100644 --- a/src/grib_expression_class_long.cc +++ b/src/grib_expression_class_long.cc @@ -37,18 +37,12 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); typedef struct grib_expression_long{ grib_expression base; @@ -62,7 +56,6 @@ static grib_expression_class _grib_expression_class_long = { "long", /* name */ sizeof(grib_expression_long),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -76,10 +69,6 @@ static grib_expression_class _grib_expression_class_long = { grib_expression_class* grib_expression_class_long = &_grib_expression_class_long; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres) diff --git a/src/grib_expression_class_string.cc b/src/grib_expression_class_string.cc index 962afeaf8..79d42e247 100644 --- a/src/grib_expression_class_string.cc +++ b/src/grib_expression_class_string.cc @@ -36,17 +36,11 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); typedef struct grib_expression_string{ grib_expression base; @@ -60,7 +54,6 @@ static grib_expression_class _grib_expression_class_string = { "string", /* name */ sizeof(grib_expression_string),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -74,10 +67,6 @@ static grib_expression_class _grib_expression_class_string = { grib_expression_class* grib_expression_class_string = &_grib_expression_class_string; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static const char* evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err) diff --git a/src/grib_expression_class_string_compare.cc b/src/grib_expression_class_string_compare.cc index 1c6202b23..421669aca 100644 --- a/src/grib_expression_class_string_compare.cc +++ b/src/grib_expression_class_string_compare.cc @@ -38,18 +38,12 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); typedef struct grib_expression_string_compare{ grib_expression base; @@ -64,7 +58,6 @@ static grib_expression_class _grib_expression_class_string_compare = { "string_compare", /* name */ sizeof(grib_expression_string_compare),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -78,10 +71,6 @@ static grib_expression_class _grib_expression_class_string_compare = { grib_expression_class* grib_expression_class_string_compare = &_grib_expression_class_string_compare; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ /* Note: A fast cut-down version of strcmp which does NOT return -1 */ diff --git a/src/grib_expression_class_sub_string.cc b/src/grib_expression_class_sub_string.cc index 988a5d0ba..a5a0da732 100644 --- a/src/grib_expression_class_sub_string.cc +++ b/src/grib_expression_class_sub_string.cc @@ -36,17 +36,11 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); typedef struct grib_expression_sub_string{ grib_expression base; @@ -60,7 +54,6 @@ static grib_expression_class _grib_expression_class_sub_string = { "sub_string", /* name */ sizeof(grib_expression_sub_string),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -74,10 +67,6 @@ static grib_expression_class _grib_expression_class_sub_string = { grib_expression_class* grib_expression_class_sub_string = &_grib_expression_class_sub_string; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static const char* evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err) diff --git a/src/grib_expression_class_true.cc b/src/grib_expression_class_true.cc index a57ce9c60..6b418cb2c 100644 --- a/src/grib_expression_class_true.cc +++ b/src/grib_expression_class_true.cc @@ -36,18 +36,12 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); typedef struct grib_expression_true{ grib_expression base; @@ -60,7 +54,6 @@ static grib_expression_class _grib_expression_class_true = { "true", /* name */ sizeof(grib_expression_true),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -74,10 +67,6 @@ static grib_expression_class _grib_expression_class_true = { grib_expression_class* grib_expression_class_true = &_grib_expression_class_true; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres) diff --git a/src/grib_expression_class_unop.cc b/src/grib_expression_class_unop.cc index 2abd4dbc9..1f4d6f9d0 100644 --- a/src/grib_expression_class_unop.cc +++ b/src/grib_expression_class_unop.cc @@ -39,18 +39,12 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ - -static void init_class (grib_expression_class*); - -static void destroy(grib_context*,grib_expression* e); - -static void print(grib_context*,grib_expression*,grib_handle*); -static void add_dependency(grib_expression* e, grib_accessor* observer); - -static int native_type(grib_expression*,grib_handle*); - -static int evaluate_long(grib_expression*,grib_handle*,long*); -static int evaluate_double(grib_expression*,grib_handle*,double*); +static void destroy(grib_context*,grib_expression* e); +static void print(grib_context*,grib_expression*,grib_handle*); +static void add_dependency(grib_expression* e, grib_accessor* observer); +static int native_type(grib_expression*,grib_handle*); +static int evaluate_long(grib_expression*,grib_handle*,long*); +static int evaluate_double(grib_expression*,grib_handle*,double*); typedef struct grib_expression_unop{ grib_expression base; @@ -66,7 +60,6 @@ static grib_expression_class _grib_expression_class_unop = { "unop", /* name */ sizeof(grib_expression_unop),/* size of instance */ 0, /* inited */ - &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, @@ -80,10 +73,6 @@ static grib_expression_class _grib_expression_class_unop = { grib_expression_class* grib_expression_class_unop = &_grib_expression_class_unop; - -static void init_class(grib_expression_class* c) -{ -} /* END_CLASS_IMP */ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)