From: Wolfgang Bangerth Date: Wed, 3 Dec 2014 13:13:26 +0000 (-0600) Subject: Patch by Lukas Korous: Work around a couple of problems with Microsoft Visual Studio... X-Git-Tag: v8.2.0-rc1~34^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c97360c83abdbd032903dba76d71ec6a78e2ccd3;p=dealii.git Patch by Lukas Korous: Work around a couple of problems with Microsoft Visual Studio. In the process, fix a couple of oversights and typos. --- diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h index 490e390b74..dcb647d981 100644 --- a/include/deal.II/grid/grid_generator.h +++ b/include/deal.II/grid/grid_generator.h @@ -279,7 +279,11 @@ namespace GridGenerator template void subdivided_parallelepiped (Triangulation &tria, - const unsigned int (n_subdivisions) [dim], +#ifndef _MSC_VER + const unsigned int(&n_subdivisions)[dim], +#else + const unsigned int *n_subdivisions, +#endif const Point (&corners) [dim], const bool colorize = false); diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc index b38a38a565..147d5d6357 100644 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@ -775,9 +775,9 @@ namespace GridGenerator const Point (&corners) [dim], const bool colorize) { - // Equalise number of subdivisions in each dim-direction, heir + // Equalise number of subdivisions in each dim-direction, their // validity will be checked later - unsigned int (n_subdivisions_) [dim]; + unsigned int n_subdivisions_ [dim]; for (unsigned int i=0; i void subdivided_parallelepiped (Triangulation &tria, - const unsigned int ( n_subdivisions) [dim], +#ifndef _MSC_VER + const unsigned int(&n_subdivisions)[dim], +#else + const unsigned int *n_subdivisions, +#endif const Point (&corners) [dim], const bool colorize) { diff --git a/source/grid/grid_generator.inst.in b/source/grid/grid_generator.inst.in index 74f78a621d..c74fb017ea 100644 --- a/source/grid/grid_generator.inst.in +++ b/source/grid/grid_generator.inst.in @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 1999 - 2013 by the deal.II authors +// Copyright (C) 1999 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -111,12 +111,21 @@ namespace GridGenerator \{ const Point (&) [deal_II_dimension], const bool); + #ifndef _MSC_VER template void subdivided_parallelepiped ( Triangulation&, - const unsigned int [deal_II_dimension], + const unsigned int (&) [deal_II_dimension], const Point (&) [deal_II_dimension], - const bool); + const bool); + #else + template void + subdivided_parallelepiped ( + Triangulation&, + const unsigned int*, + const Point (&) [deal_II_dimension], + const bool); + #endif #if deal_II_dimension > 1 template void