]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid C++11-isms in tests 2147/head
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Mon, 8 Feb 2016 10:37:01 +0000 (11:37 +0100)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Mon, 8 Feb 2016 13:25:18 +0000 (14:25 +0100)
tests/base/tensor_mixing_types_02.cc
tests/mpi/periodicity_02.cc

index a34e21ca38a72cc7aff47ed892b3e1448998b05a..317cf25793e8184dd868ebc26f0f8a4e61de6352 100644 (file)
@@ -30,9 +30,15 @@ int main ()
   double d_scalar = 10.;
   std::complex<double> c_scalar = 10.;
 
-  Tensor<1,2,float>                 f1 = { {1., 2.} };
-  Tensor<1,2,double>                d1 = { {4., 8.} };
-  Tensor<1,2,std::complex<double> > c1 = { {16., 32.} };
+  Tensor<1,2,float>                 f1;
+  f1[0] = 1.;
+  f1[1] = 2.;
+  Tensor<1,2,double>                d1;
+  d1[0] = 4.;
+  d1[1] = 8.;
+  Tensor<1,2,std::complex<double> > c1;
+  c1[0] = 16.;
+  c1[1] = 32.;
 
   deallog << f1 + d1 << std::endl;
   deallog << f1 - d1 << std::endl;
index a1f5dcde85168df73b6b8a3fd785db560779f312..04e513b7756fd42f145e54c2c7b54f85dd42e5b1 100644 (file)
@@ -366,9 +366,9 @@ namespace Step22
       GridTools::collect_periodic_faces(
         dof_handler, 2, 3, 1, periodicity_vector, Tensor<1, dim>(), matrix);
 
-      DoFTools::make_periodicity_constraints<DoFHandler<dim>>(
-                                                             periodicity_vector, constraints, fe.component_mask(velocities),
-                                                             first_vector_components);
+      DoFTools::make_periodicity_constraints<DoFHandler<dim> >(
+        periodicity_vector, constraints, fe.component_mask(velocities),
+        first_vector_components);
 #endif
     }
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.