From: maier Date: Fri, 28 Sep 2012 15:31:33 +0000 (+0000) Subject: Remove workarounds for DEAL_II_ARRAY_ARG_BUG from the source X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93d8fdcbafb8f697b97b264b465b79a9c0632751;p=dealii-svn.git Remove workarounds for DEAL_II_ARRAY_ARG_BUG from the source git-svn-id: https://svn.dealii.org/branches/branch_cmake@26845 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/base/geometry_info.h b/deal.II/include/deal.II/base/geometry_info.h index cd6485273d..e2b005a2d7 100644 --- a/deal.II/include/deal.II/base/geometry_info.h +++ b/deal.II/include/deal.II/base/geometry_info.h @@ -2162,13 +2162,8 @@ struct GeometryInfo static void alternating_form_at_vertices -#ifndef DEAL_II_ARRAY_ARG_BUG (const Point (&vertices)[vertices_per_cell], Tensor (&forms)[vertices_per_cell]) -#else - (const Point *vertices, - Tensor *forms) -#endif ; /** diff --git a/deal.II/source/base/geometry_info.cc b/deal.II/source/base/geometry_info.cc index 366731bc61..ded305d70b 100644 --- a/deal.II/source/base/geometry_info.cc +++ b/deal.II/source/base/geometry_info.cc @@ -1680,13 +1680,8 @@ template void GeometryInfo:: alternating_form_at_vertices -#ifndef DEAL_II_ARRAY_ARG_BUG (const Point (&vertices)[vertices_per_cell], Tensor (&forms)[vertices_per_cell]) -#else - (const Point *vertices, - Tensor *forms) -#endif { // for each of the vertices, // compute the alternating form @@ -1744,52 +1739,32 @@ template void GeometryInfo<1>:: alternating_form_at_vertices -#ifndef DEAL_II_ARRAY_ARG_BUG (const Point<1> (&vertices)[vertices_per_cell], Tensor<1-1,1> (&forms)[vertices_per_cell]) -#else - (const Point<1> *vertices, - Tensor<1-1,1> *forms) -#endif ; template void GeometryInfo<1>:: alternating_form_at_vertices -#ifndef DEAL_II_ARRAY_ARG_BUG (const Point<2> (&vertices)[vertices_per_cell], Tensor<2-1,2> (&forms)[vertices_per_cell]) -#else - (const Point<2> *vertices, - Tensor<2-1,2> *forms) -#endif ; template void GeometryInfo<2>:: alternating_form_at_vertices -#ifndef DEAL_II_ARRAY_ARG_BUG (const Point<2> (&vertices)[vertices_per_cell], Tensor<2-2,2> (&forms)[vertices_per_cell]) -#else - (const Point<2> *vertices, - Tensor<2-2,2> *forms) -#endif ; template void GeometryInfo<2>:: alternating_form_at_vertices -#ifndef DEAL_II_ARRAY_ARG_BUG (const Point<3> (&vertices)[vertices_per_cell], Tensor<3-2,3> (&forms)[vertices_per_cell]) -#else -(const Point<3> *vertices, - Tensor<3-2,3> *forms) -#endif ; @@ -1797,13 +1772,8 @@ template void GeometryInfo<3>:: alternating_form_at_vertices -#ifndef DEAL_II_ARRAY_ARG_BUG (const Point<3> (&vertices)[vertices_per_cell], Tensor<3-3,3> (&forms)[vertices_per_cell]) -#else -(const Point<3> *vertices, - Tensor<3-3,3> *forms) -#endif ;