Do not use dim3 for non-CUDA code

dim3 is an array of size 3 defined by CUDA. Remove non CUDA-related dim3
because it creates an error due to conflicting declaration.

diff --git a/tests/grid/grid_generator_cheese.cc b/tests/grid/grid_generator_cheese.cc
index c97b335958f5e9af5a5e0dad8e2aa6ce2961db2e..3491f98d4594627f2e9565a228f429066176ed7d 100644 (file)
--- a/tests/grid/grid_generator_cheese.cc
+++ b/tests/grid/grid_generator_cheese.cc
@@ -23,7 +23,7 @@
 
 
 
-void dim2(std::ostream &os)
+void dim_2(std::ostream &os)
 {
   const unsigned int d=2;
   Triangulation<d> tr;
@@ -37,7 +37,7 @@ void dim2(std::ostream &os)
   gout.write_vtk(tr, os);
 }
 
-void dim3(std::ostream &os)
+void dim_3(std::ostream &os)
 {
   const unsigned int d=3;
   Triangulation<d> tr;
@@ -57,6 +57,6 @@ int main()
 {
   initlog(true);
   std::ostream &logfile = deallog.get_file_stream();
-  dim2(logfile);
-  dim3(logfile);
+  dim_2(logfile);
+  dim_3(logfile);
 }

diff --git a/tests/grid/grid_generator_general_cell.cc b/tests/grid/grid_generator_general_cell.cc
index edbd29492873aed073261c522d9a7b7ccc9d5c23..a428af68adba54c2c8f4d83c62b28873c6525153 100644 (file)
--- a/tests/grid/grid_generator_general_cell.cc
+++ b/tests/grid/grid_generator_general_cell.cc
@@ -20,7 +20,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_out.h>
 
-void dim2(std::ostream &os)
+void dim_2(std::ostream &os)
 {
   std::vector<Point<2> > vertices(4);
   vertices[0](0) = -1.;
@@ -39,7 +39,7 @@ void dim2(std::ostream &os)
   gout.write_vtk(tria, os);
 }
 
-void dim3(std::ostream &os)
+void dim_3(std::ostream &os)
 {
   std::vector<Point<3> > vertices(8);
   vertices[0](0) = -1.;
@@ -79,6 +79,6 @@ int main()
 {
   initlog(true);
   std::ostream &logfile = deallog.get_file_stream();
-  dim2(logfile);
-  dim3(logfile);
+  dim_2(logfile);
+  dim_3(logfile);
 }

diff --git a/tests/grid/grid_generator_hyper_cross.cc b/tests/grid/grid_generator_hyper_cross.cc
index b00ca690cab65f7ea1bfcc2456fc5c84cbcc0313..98fe598f11d4fdb9dec21279bfa5c83bbda71b78 100644 (file)
--- a/tests/grid/grid_generator_hyper_cross.cc
+++ b/tests/grid/grid_generator_hyper_cross.cc
@@ -23,7 +23,7 @@
 
 
 
-void dim2(std::ostream &os)
+void dim_2(std::ostream &os)
 {
   const unsigned int d=2;
   Triangulation<d> tr;
@@ -39,7 +39,7 @@ void dim2(std::ostream &os)
   gout.write_vtk(tr, os);
 }
 
-void dim3(std::ostream &os)
+void dim_3(std::ostream &os)
 {
   const unsigned int d=3;
   Triangulation<d> tr;
@@ -62,6 +62,6 @@ int main()
 {
   initlog(true);
   std::ostream &logfile = deallog.get_file_stream();
-  dim2(logfile);
-  dim3(logfile);
+  dim_2(logfile);
+  dim_3(logfile);
 }

diff --git a/tests/grid/grid_generator_simplex.cc b/tests/grid/grid_generator_simplex.cc
index 3e29f5336cee3d308cd7287a70baa5dee22c704a..26393f8814e2ba79f6ae73df5a3eb4db6f9d693a 100644 (file)
--- a/tests/grid/grid_generator_simplex.cc
+++ b/tests/grid/grid_generator_simplex.cc
@@ -23,7 +23,7 @@
 
 
 
-void dim2(std::ostream &os)
+void dim_2(std::ostream &os)
 {
   const unsigned int d=2;
   Triangulation<d> tr;
@@ -39,7 +39,7 @@ void dim2(std::ostream &os)
   gout.write_vtk(tr, os);
 }
 
-void dim3(std::ostream &os)
+void dim_3(std::ostream &os)
 {
   const unsigned int d=3;
   Triangulation<d> tr;
@@ -68,6 +68,6 @@ int main()
 {
   initlog(true);
   std::ostream &logfile = deallog.get_file_stream();
-  dim2(logfile);
-  dim3(logfile);
+  dim_2(logfile);
+  dim_3(logfile);
 }

diff --git a/tests/grid/manifold_ids_on_boundary_01.cc b/tests/grid/manifold_ids_on_boundary_01.cc
index 7acc4c89439e68a44aee6489f86f9df7d7396a01..1249e74cad5419f50cd6d5c39826ec7a1cc620fa 100644 (file)
--- a/tests/grid/manifold_ids_on_boundary_01.cc
+++ b/tests/grid/manifold_ids_on_boundary_01.cc
@@ -26,7 +26,7 @@
 #include <iostream>
 
 
-void dim2(std::ostream &os)
+void dim_2(std::ostream &os)
 {
   const unsigned int d=2;
   const Point<d> center(0,0);
@@ -46,7 +46,7 @@ void dim2(std::ostream &os)
   gout.write_vtk(tr, os);
 }
 
-void dim3(std::ostream &os)
+void dim_3(std::ostream &os)
 {
   const unsigned int d=3;
 
@@ -70,6 +70,6 @@ int main()
 {
   initlog(true);
   std::ostream &logfile = deallog.get_file_stream();
-  dim2(logfile);
-  dim3(logfile);
+  dim_2(logfile);
+  dim_3(logfile);
 }