Use inline definitions for simple getters

Author: eivindjahren

lib/include/resdata/smspec_node.hpp

@@ -117,25 +117,29 @@ class smspec_node {
         return this->cmp(other) > 0;
     }
 
-    int get_R1() const;
-    int get_R2() const;
-    const char *get_gen_key1() const;
-    const char *get_gen_key2() const;
-    rd_smspec_var_type get_var_type() const;
-    int get_num() const;
-    const char *get_wgname() const;
-    const char *get_keyword() const;
-    const char *get_unit() const;
-    bool is_rate() const;
-    bool is_total() const;
-    bool is_historical() const;
-    bool need_nums() const;
+    [[nodiscard]] int get_R1() const;
+    [[nodiscard]] int get_R2() const;
+    [[nodiscard]] const char *get_gen_key1() const;
+    [[nodiscard]] const char *get_gen_key2() const;
+    [[nodiscard]] rd_smspec_var_type get_var_type() const { return var_type; };
+    [[nodiscard]] int get_num() const { return num; };
+    [[nodiscard]] const char *get_wgname() const;
+    [[nodiscard]] const char *get_keyword() const;
+    [[nodiscard]] const char *get_unit() const;
+    [[nodiscard]] bool is_rate() const { return rate_variable; };
+    [[nodiscard]] bool is_total() const { return total_variable; };
+    [[nodiscard]] bool is_historical() const { return historical; };
+    [[nodiscard]] bool need_nums() const;
     void fprintf__(FILE *stream) const;
-    int get_params_index() const;
-    float get_default() const;
-    const std::array<int, 3> &get_ijk() const;
-    const char *get_lgr_name() const;
-    const std::array<int, 3> &get_lgr_ijk() const;
+    [[nodiscard]] int get_params_index() const { return params_index; };
+    [[nodiscard]] float get_default() const { return default_value; };
+    // Will be garbage for smspec_nodes which do not have i,j,k
+    [[nodiscard]] const std::array<int, 3> &get_ijk() const { return ijk; };
+    [[nodiscard]] const char *get_lgr_name() const;
+    // Will be garbage for smspec_nodes which are not related to an LGR.
+    [[nodiscard]] const std::array<int, 3> &get_lgr_ijk() const {
+        return lgr_ijk;
+    };
 };
 
 } // namespace rd

lib/resdata/smspec_node.cpp

@@ -533,8 +533,6 @@ bool smspec_node_identify_total(const char *keyword,
 
 namespace rd {
 
-float smspec_node::get_default() const { return this->default_value; }
-
 void smspec_node::set_lgr_ijk(int lgr_i, int lgr_j, int lgr_k) {
     lgr_ijk[0] = lgr_i;
     lgr_ijk[1] = lgr_j;
@@ -1032,12 +1030,6 @@ smspec_node::smspec_node(int param_index_, const char *keyword_,
     set_gen_keys(key_join_string_);
 }
 
-int smspec_node::get_params_index() const { return this->params_index; }
-
-// void smspec_node::set_params_index( int params_index_) {
-// this->params_index = params_index_;
-// }
-
 namespace {
 
 const char *get_cstring(const std::string &s) {
@@ -1065,31 +1057,13 @@ const char *smspec_node::get_keyword() const {
     return get_cstring(this->keyword);
 }
 
-rd_smspec_var_type smspec_node::get_var_type() const { return this->var_type; }
-
-int smspec_node::get_num() const { return this->num; }
-
-bool smspec_node::is_rate() const { return this->rate_variable; }
-
-bool smspec_node::is_total() const { return this->total_variable; }
-
-bool smspec_node::is_historical() const { return this->historical; }
-
 const char *smspec_node::get_unit() const { return this->unit.c_str(); }
 
-// Will be garbage for smspec_nodes which do not have i,j,k
-const std::array<int, 3> &smspec_node::get_ijk() const { return this->ijk; }
-
 // Will be NULL for smspec_nodes which are not related to an LGR.
 const char *smspec_node::get_lgr_name() const {
     return get_cstring(this->lgr_name);
 }
 
-// Will be garbage for smspec_nodes which are not related to an LGR.
-const std::array<int, 3> &smspec_node::get_lgr_ijk() const {
-    return this->lgr_ijk;
-}
-
 /*
   Will return -1 for smspec_node variables which are not
   of type RD_SMSPEC_REGION_2_REGION_VAR.