From: Matthias Maier Date: Tue, 15 Oct 2013 21:34:40 +0000 (+0000) Subject: Nice try, nice try... X-Git-Tag: v8.1.0~570^2~54 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af99cc96f9c1673d22fe6f620568bbe3cc02983;p=dealii.git Nice try, nice try... git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31245 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html index 36e6226be7..817a1fc29f 100644 --- a/deal.II/doc/readme.html +++ b/deal.II/doc/readme.html @@ -83,7 +83,7 @@
  • Mac OS X: GCC version 4.1 or later; Clang version 3.0 or later. Please see the deal.II Wiki for installation instructions.
  • -
  • Windows: Cygwin64 with gcc-4.8.1 (Cygwin32 is not supported). +
  • Windows: Currently unsupported. Please see the deal.II Wiki for installation instructions.
  • diff --git a/deal.II/include/deal.II/base/geometry_info.h b/deal.II/include/deal.II/base/geometry_info.h index ea6d4b11f1..ced3b187de 100644 --- a/deal.II/include/deal.II/base/geometry_info.h +++ b/deal.II/include/deal.II/base/geometry_info.h @@ -1457,13 +1457,7 @@ struct GeometryInfo /** * Number of vertices of a cell. */ -#ifdef DEAL_II_USE_CXX11 - // Workaround for some versions of gcc-4.8.1 (notably on Cygwin and Mac) - // that incorrectly fail to deduce the second version as a constexpr - static constexpr unsigned int vertices_per_cell = 1 << dim; -#else static const unsigned int vertices_per_cell = 1 << dim; -#endif /** * Number of vertices on each diff --git a/deal.II/source/base/geometry_info.cc b/deal.II/source/base/geometry_info.cc index 5765bb6826..6569451117 100644 --- a/deal.II/source/base/geometry_info.cc +++ b/deal.II/source/base/geometry_info.cc @@ -31,13 +31,7 @@ GeometryInfo<0>::n_children(const RefinementCase<0> &) template const unsigned int GeometryInfo::max_children_per_cell; template const unsigned int GeometryInfo::faces_per_cell; template const unsigned int GeometryInfo::max_children_per_face; -#ifdef DEAL_II_USE_CXX11 - // Workaround for some versions of gcc-4.8.1 (notably on Cygwin and Mac) - // that incorrectly fail to deduce the second version as a constexpr - template constexpr unsigned int GeometryInfo::vertices_per_cell; -#else - template const unsigned int GeometryInfo::vertices_per_cell; -#endif +template const unsigned int GeometryInfo::vertices_per_cell; template const unsigned int GeometryInfo::vertices_per_face; template const unsigned int GeometryInfo::lines_per_face; template const unsigned int GeometryInfo::quads_per_face;