Fixed a problem when accessing a vector

UniStuttgart-VISUS · Feb 28, 2020 · 79d2768 · 79d2768
1 parent a7deb5c
commit 79d2768
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/include/tpf/data/tpf_stencil.inl b/include/tpf/data/tpf_stencil.inl
@@ -10,6 +10,25 @@
 #include <cmath>
 #include <stdexcept>
 
+namespace
+{
+    template <typename U, typename T>
+    struct caster
+    {
+        template <typename U_ = typename std::remove_reference<U>::type, typename T_ = typename std::remove_reference<T>::type>
+        U& operator()(T& value, typename std::enable_if<std::is_convertible<T_, U_>::value>::type* = nullptr) const
+        {
+            return static_cast<U>(value);
+        }
+
+        template <typename U_ = typename std::remove_reference<U>::type, typename T_ = typename std::remove_reference<T>::type>
+        U operator()(T& value, typename std::enable_if<!std::is_convertible<T_, U_>::value>::type* = nullptr) const
+        {
+            return U(value.data());
+        }
+    };
+}
+
 namespace tpf
 {
     namespace data
@@ -235,13 +254,13 @@ namespace tpf
                     break;
                 case GRADIENT:
                     this->temp_constant = gradient(grid_coords);
-                    return this->temp_constant;
+                    return caster<return_type, element_type>()(this->temp_constant);
 
                     break;
                 case CONSTANT:
                 default:
                     this->temp_constant = this->constant;
-                    return this->temp_constant;
+                    return caster<return_type, element_type>()(this->temp_constant);
                 }
             }
         }