Minor cleanups

asherikov · Jun 22, 2024 · 1a86812 · 1a86812
1 parent 8a7b1ba
commit 1a86812
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/extra_adapters/eigen/eigen.h b/extra_adapters/eigen/eigen.h
@@ -28,7 +28,7 @@ namespace ariles2
             ARILES2_TRACE_FUNCTION;
             const std::size_t size = visitor.startVector();
 
-            if (Eigen::Dynamic == t_rows)
+            if constexpr (Eigen::Dynamic == t_rows)
             {
                 entry.resize(size);
             }
@@ -252,9 +252,9 @@ namespace ariles2
                 const typename t_Visitor::Parameters &param)
         {
             ARILES2_TRACE_FUNCTION;
-            if (Eigen::Dynamic == t_rows)
+            if constexpr (Eigen::Dynamic == t_rows)
             {
-                if (Eigen::Dynamic == t_cols)
+                if constexpr (Eigen::Dynamic == t_cols)
                 {
                     entry.resize(0, 0);
                 }
@@ -265,7 +265,7 @@ namespace ariles2
             }
             else
             {
-                if (Eigen::Dynamic == t_cols)
+                if constexpr (Eigen::Dynamic == t_cols)
                 {
                     entry.resize(t_rows, 0);
                 }

diff --git a/include/ariles2/adapters/basic.h b/include/ariles2/adapters/basic.h
@@ -112,8 +112,7 @@ namespace ariles2
                 apply_write(t_Visitor &writer, const t_Enumeration entry, const typename t_Visitor::Parameters &param)
         {
             ARILES2_TRACE_FUNCTION;
-            const int tmp_value = entry;
-            writer.writeElement(tmp_value, param);
+            writer.writeElement(static_cast<int>(entry), param);
         }
 
 

diff --git a/include/ariles2/visitors/defaults.h b/include/ariles2/visitors/defaults.h
@@ -49,6 +49,22 @@ namespace ariles2
             template <typename t_Scalar>
             inline t_Scalar getDefault() const
             {
+                if constexpr (std::is_same_v<double, t_Scalar>)
+                {
+                    return default_double_value_;
+                }
+                if constexpr (std::is_same_v<float, t_Scalar>)
+                {
+                    return default_float_value_;
+                }
+                if constexpr (std::is_same_v<bool, t_Scalar>)
+                {
+                    return false;
+                }
+                if constexpr (std::is_same_v<std::string, t_Scalar>)
+                {
+                    return "";
+                }
                 return 0;
             }
         };
@@ -86,30 +102,6 @@ namespace ariles2
             }
         };
 
-        template <>
-        inline double Visitor::Parameters::getDefault<double>() const
-        {
-            return default_double_value_;
-        }
-
-        template <>
-        inline float Visitor::Parameters::getDefault<float>() const
-        {
-            return default_float_value_;
-        }
-
-        template <>
-        inline bool Visitor::Parameters::getDefault<bool>() const
-        {
-            return false;
-        }
-
-        template <>
-        inline std::string Visitor::Parameters::getDefault<std::string>() const
-        {
-            return "";
-        }
-
 
         class ARILES2_VISIBILITY_ATTRIBUTE Base : public entry::Base<const defaults::Visitor>
         {