[Getfem-commits] r4923 - /trunk/getfem/src/getfem_generic_assembly.cc

[andriy . andreykiv]

Author: andrico
Date: Mon Mar 30 13:40:04 2015
New Revision: 4923

URL: http://svn.gna.org/viewcvs/getfem?rev=4923&view=rev
Log:
temporary replaced constructor inheritance in 
getfem/src/getfem_generic_assembly.cc
with full constructor definitions until it's fully supported by Intel and MSVC 
compilers

Modified:
    trunk/getfem/src/getfem_generic_assembly.cc

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4923&r1=4922&r2=4923&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Mon Mar 30 13:40:04 2015
@@ -2330,7 +2330,13 @@
       return 0;
     }
 
-    using ga_instruction_first_ind_tensor::ga_instruction_first_ind_tensor;
+    ga_instruction_second_ind_tensor(base_tensor &t_, 
fem_interpolation_context &ctx_,
+                                    size_type qdim_, const mesh_fem *mfn_,
+                                    const mesh_fem **mfg_)
+   : ga_instruction_first_ind_tensor(t_, ctx_, qdim_, mfn_, mfg_)
+   {}
+;
+
   };
 
   struct ga_instruction_two_first_ind_tensor : public ga_instruction {
@@ -2469,7 +2475,10 @@
       return 0;
     }
 
-    using ga_instruction_val_base::ga_instruction_val_base;
+    ga_instruction_grad_base(base_tensor &tt, fem_interpolation_context &ct,
+                            const mesh_fem &mf_, pfem_precomp &pfp_)
+    : ga_instruction_val_base(tt, ct, mf_,pfp_)
+    {}
   };
 
   struct ga_instruction_hess_base : public ga_instruction_val_base {
@@ -2482,7 +2491,10 @@
       return 0;
     }
 
-    using ga_instruction_val_base::ga_instruction_val_base;
+    ga_instruction_hess_base(base_tensor &tt, fem_interpolation_context &ct,
+                            const mesh_fem &mf_, pfem_precomp &pfp_)
+    : ga_instruction_val_base(tt, ct, mf_, pfp_)
+    {}
   };
 
   struct ga_instruction_val : public ga_instruction {
@@ -2541,7 +2553,11 @@
       return 0;
     }
 
-    using ga_instruction_val::ga_instruction_val;
+    ga_instruction_grad(base_tensor &tt, base_tensor &Z_,
+                       const base_vector &co, size_type q)
+    : ga_instruction_val(tt, Z_, co, q)
+    {}
+
   };
 
   struct ga_instruction_hess : public ga_instruction_val {
@@ -2569,7 +2585,10 @@
       return 0;
     }
 
-    using ga_instruction_val::ga_instruction_val;
+    ga_instruction_hess(base_tensor &tt, base_tensor &Z_,
+                       const base_vector &co, size_type q)
+    : ga_instruction_val(tt, Z_, co, q)
+    {}
   };
 
   struct ga_instruction_copy_val_base : public ga_instruction {
@@ -2642,7 +2661,9 @@
       return 0;
     }
 
-    using ga_instruction_copy_val_base::ga_instruction_copy_val_base;
+     ga_instruction_copy_grad_base(base_tensor &tt, base_tensor &Z_, size_type 
q)
+     : ga_instruction_copy_val_base(tt,Z_,q)
+     {}
   };
 
   struct ga_instruction_copy_hess_base : public ga_instruction_copy_val_base {
@@ -2679,7 +2700,9 @@
       return 0;
     }
 
-    using ga_instruction_copy_val_base::ga_instruction_copy_val_base;
+    ga_instruction_copy_hess_base(base_tensor &tt, base_tensor &Z_, size_type 
q)
+    : ga_instruction_copy_val_base(tt, Z_, q)
+    {}
   };
 
   struct ga_instruction_elementary_transformation {
@@ -2871,7 +2894,12 @@
       return 0;
     }
 
-    using ga_instruction_interpolate::ga_instruction_interpolate;
+    ga_instruction_interpolate_val(base_tensor &tt, const mesh **m_, const 
mesh_fem *mfn_,
+     const mesh_fem **mfg_,
+     const base_vector *Un_, const base_vector **Ug_,
+     fem_interpolation_context &ctx_, size_type q)
+    : ga_instruction_interpolate(tt, m_, mfn_, mfg_, Un_, Ug_,ctx_, q)
+    {}
   };
 
   struct ga_instruction_interpolate_grad : public ga_instruction_interpolate {
@@ -2885,7 +2913,12 @@
       return 0;
     }
 
-    using ga_instruction_interpolate::ga_instruction_interpolate;
+    ga_instruction_interpolate_grad(base_tensor &tt, const mesh **m_, const 
mesh_fem *mfn_,
+     const mesh_fem **mfg_,
+     const base_vector *Un_, const base_vector **Ug_,
+     fem_interpolation_context &ctx_, size_type q)
+    : ga_instruction_interpolate(tt, m_, mfn_, mfg_, Un_, Ug_, ctx_, q)
+    {}
   };
 
   struct ga_instruction_interpolate_hess : public ga_instruction_interpolate {
@@ -2899,7 +2932,12 @@
       return 0;
     }
 
-    using ga_instruction_interpolate::ga_instruction_interpolate;
+    ga_instruction_interpolate_hess(base_tensor &tt, const mesh **m_, const 
mesh_fem *mfn_,
+     const mesh_fem **mfg_,
+     const base_vector *Un_, const base_vector **Ug_,
+     fem_interpolation_context &ctx_, size_type q)
+    : ga_instruction_interpolate(tt, m_, mfn_, mfg_, Un_, Ug_, ctx_, q)
+    {}
   };
 
   struct ga_instruction_interpolate_base {