smspec_node: removed typdef.

iocenter · Nov 27, 2018 · 6aa1748 · 6aa1748
1 parent 58108c9
commit 6aa1748
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -22,7 +22,7 @@
 #include <ert/util/util.h>
 #include <ert/util/test_util.hpp>
 
-#include <ert/ecl/smspec_node.h>
+#include <ert/ecl/smspec_node.hpp>
 
 
 static void test_identify_rate_variable() {

diff --git 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
@@ -31,7 +31,7 @@
 #include <string>
 #include <array>
 
-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,15 +119,15 @@ 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    ,
                      const char * key_join_string ,
                      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    ,