From 6aa174871a4bf6fcfe725641e9b0174ba6a3015e Mon Sep 17 00:00:00 2001 From: Steinar Foss Date: Tue, 13 Nov 2018 13:13:10 +0100 Subject: [PATCH] smspec_node: removed typdef. --- lib/ecl/smspec_node.cpp | 6 +++--- lib/ecl/tests/ecl_smspec_node.cpp | 2 +- lib/include/ert/ecl/smspec_node.h | 2 -- lib/include/ert/ecl/smspec_node.hpp | 8 ++++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/ecl/smspec_node.cpp b/lib/ecl/smspec_node.cpp index b0a77b1ff1..38417df3db 100644 --- a/lib/ecl/smspec_node.cpp +++ b/lib/ecl/smspec_node.cpp @@ -609,9 +609,9 @@ bool smspec_node_type::init__( ecl_smspec_var_type var_type , ecl_smspec_fread_header() functions in addition. UGGGLY */ -smspec_node_struct::smspec_node_struct() {} +smspec_node_type::smspec_node_type() {} -smspec_node_struct::smspec_node_struct( ecl_smspec_var_type var_type_ , +smspec_node_type::smspec_node_type( ecl_smspec_var_type var_type_ , const char * wgname , const char * keyword , const char * unit , @@ -708,7 +708,7 @@ void smspec_node_type::init_lgr( ecl_smspec_var_type var_type , set_gen_keys( key_join_string ); } -smspec_node_struct::smspec_node_struct( ecl_smspec_var_type var_type_ , +smspec_node_type::smspec_node_type( ecl_smspec_var_type var_type_ , const char * wgname_ , const char * keyword_ , const char * unit_ , diff --git a/lib/ecl/tests/ecl_smspec_node.cpp b/lib/ecl/tests/ecl_smspec_node.cpp index e32291a53f..0e8edf44c8 100644 --- a/lib/ecl/tests/ecl_smspec_node.cpp +++ b/lib/ecl/tests/ecl_smspec_node.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include static void test_identify_rate_variable() { diff --git a/lib/include/ert/ecl/smspec_node.h b/lib/include/ert/ecl/smspec_node.h index 720fe6afe7..ddc0a56b93 100644 --- a/lib/include/ert/ecl/smspec_node.h +++ b/lib/include/ert/ecl/smspec_node.h @@ -46,8 +46,6 @@ typedef enum {ECL_SMSPEC_INVALID_VAR = 0 , #define SMSPEC_NUMS_GROUP 2 #define SMSPEC_NUMS_FIELD 0 -typedef struct smspec_node_struct smspec_node_type; - #define SMSPEC_TYPE_ID 61550451 char * smspec_alloc_block_ijk_key( const char * join_string , const char * keyword , int i , int j , int k); diff --git a/lib/include/ert/ecl/smspec_node.hpp b/lib/include/ert/ecl/smspec_node.hpp index cc2365c527..f9bbdb81a2 100644 --- a/lib/include/ert/ecl/smspec_node.hpp +++ b/lib/include/ert/ecl/smspec_node.hpp @@ -31,7 +31,7 @@ #include #include -struct smspec_node_struct { +class smspec_node_type { private: std::string wgname; @@ -53,7 +53,7 @@ struct smspec_node_struct { int params_index; /* The index of this variable (applies to all the vectors - in particular the PARAMS vectors of the summary files *.Snnnn / *.UNSMRY ). */ float default_value; /* Default value for this variable. */ - smspec_node_struct(); + smspec_node_type(); void set_invalid_flags(); void init_lgr( ecl_smspec_var_type var_type , @@ -119,7 +119,7 @@ struct smspec_node_struct { public: - smspec_node_struct(ecl_smspec_var_type var_type , + smspec_node_type(ecl_smspec_var_type var_type , const char * wgname , const char * keyword , const char * unit , @@ -127,7 +127,7 @@ struct smspec_node_struct { const int grid_dims[3] , int num , int param_index, float default_value); - smspec_node_struct(ecl_smspec_var_type var_type , + smspec_node_type(ecl_smspec_var_type var_type , const char * wgname , const char * keyword , const char * unit ,