From 25be941054332725d46834065bc252420b3b2287 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Thu, 17 Aug 2017 17:23:52 -0400 Subject: [PATCH] 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. --- tests/grid/grid_generator_cheese.cc | 8 ++++---- tests/grid/grid_generator_general_cell.cc | 8 ++++---- tests/grid/grid_generator_hyper_cross.cc | 8 ++++---- tests/grid/grid_generator_simplex.cc | 8 ++++---- tests/grid/manifold_ids_on_boundary_01.cc | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/grid/grid_generator_cheese.cc b/tests/grid/grid_generator_cheese.cc index c97b335958..3491f98d45 100644 --- 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 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 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 edbd294928..a428af68ad 100644 --- a/tests/grid/grid_generator_general_cell.cc +++ b/tests/grid/grid_generator_general_cell.cc @@ -20,7 +20,7 @@ #include #include -void dim2(std::ostream &os) +void dim_2(std::ostream &os) { std::vector > 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 > 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 b00ca690ca..98fe598f11 100644 --- 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 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 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 3e29f5336c..26393f8814 100644 --- 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 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 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 7acc4c8943..1249e74cad 100644 --- a/tests/grid/manifold_ids_on_boundary_01.cc +++ b/tests/grid/manifold_ids_on_boundary_01.cc @@ -26,7 +26,7 @@ #include -void dim2(std::ostream &os) +void dim_2(std::ostream &os) { const unsigned int d=2; const Point 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); } -- 2.39.5