compared to master, ready to merge

program/source/extemp/functor.h

@@ -494,10 +494,10 @@ template < class A, class B, class C, class D,
 class DTyp_Result, class DTyp, class Func >
 inline DTyp_Result
 Exp_Functor4<A, B, C, D, DTyp_Result, DTyp, Func>::Give_cell_hexahedra ( params_in_cell ) const {
-        return functor_->evaluate ( a_.Give_cell_hexahedra ( params_out_cell ),
-                                    b_.Give_cell_hexahedra ( params_out_cell ),
-                                    c_.Give_cell_hexahedra ( params_out_cell ),
-                                    d_.Give_cell_hexahedra ( params_out_cell ) );
+        return functor_->evaluate ( a_.template Give_cell_hexahedra ( params_out_cell ),
+                                    b_.template Give_cell_hexahedra ( params_out_cell ),
+                                    c_.template Give_cell_hexahedra ( params_out_cell ),
+                                    d_.template Give_cell_hexahedra ( params_out_cell ) );
 }
 
 

program/source/extemp/variable.h

@@ -118,7 +118,7 @@ class Expr_Restriction {
 		}
 		
 		inline Result Give_cell_hexahedra ( params_in_cell ) const  {
-			return a_.Give_cell_hexahedra ( params_out_cell );
+            return a_.template Give_cell_hexahedra ( params_out_cell );
 		}
 		
 		template <elementTyp TYP_EL>

program/source/pde_op/diffop.h

@@ -653,11 +653,7 @@ class Local_stiffness_matrix : public Expr<Local_stiffness_matrix<TYPE2> > {
 		template <class B>
 		void Calculate_all_left_boundaries(const B& bilinear_form);
 
-        template <class B>
-        void Calculate_all_radial_boundaries(const B& bilinear_form);
-		
-		
-		void Print();
+        void Print();
 		void Update();
 		
 		void makePetrovGalerkinZ();