fix compiling for the removal of the macro

Author: hverhelst

src/gsMaterialMatrixComposite.h

@@ -40,7 +40,7 @@ class gsMaterialMatrixComposite : public gsMaterialMatrixBaseDim<dim,T>
 {
 public:
 
-    GISMO_OVERRIDE_CLONE_FUNCTION(gsMaterialMatrixComposite)
+    GISMO_CLONE_FUNCTION(gsMaterialMatrixComposite)
 
     using Base = gsMaterialMatrixBaseDim<dim,T>;
 

src/gsMaterialMatrixLinear.h

@@ -40,7 +40,7 @@ class gsMaterialMatrixLinear : public gsMaterialMatrixBaseDim<dim,T>
 
     typedef T Scalar_t;
 
-    GISMO_OVERRIDE_CLONE_FUNCTION(gsMaterialMatrixLinear);
+    GISMO_CLONE_FUNCTION(gsMaterialMatrixLinear);
 
     using Base = gsMaterialMatrixBaseDim<dim,T>;
 

src/gsMaterialMatrixNonlinear.h

@@ -47,7 +47,7 @@ class gsMaterialMatrixNonlinear :    public gsMaterialMatrixBaseDim<dim,T>
 {
 public:
 
-    GISMO_OVERRIDE_CLONE_FUNCTION(gsMaterialMatrixNonlinear);
+    GISMO_CLONE_FUNCTION(gsMaterialMatrixNonlinear);
 
     using Base = gsMaterialMatrixBaseDim<dim,T>;
 

src/gsMaterialMatrixTFT.h

@@ -54,7 +54,7 @@ class gsMaterialMatrixTFT : public gsMaterialMatrixBaseDim<dim,T>
     typedef typename gsFunctionSet<T>::Ptr function_ptr;
 
     // Define clone functions
-    GISMO_OVERRIDE_CLONE_FUNCTION(gsMaterialMatrixTFT)
+    GISMO_CLONE_FUNCTION(gsMaterialMatrixTFT)
 
 public:
 

src/gsMaterialMatrixXml.hpp

@@ -323,21 +323,22 @@ gsXmlNode * putMaterialMatrixToXml ( Object const & obj, gsXmlTree & data)
 
     GISMO_ASSERT(obj.hasThickness(),"Thickness is not assigned");
     gsXmlNode * t = internal::makeNode("Thickness", data);
-    gsXmlNode * tfun = putFunctionToXml<T>(obj.getThickness(), data, 0);
+    GISMO_ASSERT((dynamic_cast<gsFunction<T> *>(obj.getThickness().get())),"Function is not of type gsFunction<T>");
+    gsXmlNode * tfun = putFunctionToXml<T>(static_cast<gsFunction<T> &>(*(obj.getThickness().get())), data, 0);
     t->append_node(tfun);
     mm->append_node(t);
     if (obj.hasDensity())
     {
         gsXmlNode * r = internal::makeNode("Density", data);
-        gsXmlNode * rfun = putFunctionToXml<T>(obj.getDensity(), data, 0);
+        gsXmlNode * rfun = putFunctionToXml<T>(static_cast<gsFunction<T> &>(*(obj.getDensity().get())), data, 0);
         r->append_node(rfun);
         mm->append_node(r);
     }
 
     gsXmlNode * p = internal::makeNode("Parameters", data);
     for (index_t k=0; k!=obj.numParameters(); k++)
     {
-        gsXmlNode * pfun = putFunctionToXml<T>(obj.getParameter(k), data, k);
+        gsXmlNode * pfun = putFunctionToXml<T>(static_cast<gsFunction<T> &>(*(obj.getParameter(k).get())), data, k);
         p->append_node(pfun);
     }
     mm->append_node(p);