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 36e6226be7ff0430b49a7579160e279137d8abe2..817a1fc29f91184d29f0cf84bebfc2fdd44b8d4e 100644 (file)
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -83,7 +83,7 @@
   <li>Mac OS X: GCC version 4.1 or later; Clang version 3.0 or later.
     Please see the <a href="https://code.google.com/p/dealii/wiki/MacOSX"
     target="_top">deal.II Wiki</a> for installation instructions.</li>
-  <li>Windows: Cygwin64 with gcc-4.8.1 (Cygwin32 is not supported).
+  <li>Windows: Currently unsupported.
     Please see the <a href="https://code.google.com/p/dealii/wiki/Windows"
     target="_top">deal.II Wiki</a> for installation instructions.</li>
   </li>

diff --git a/deal.II/include/deal.II/base/geometry_info.h b/deal.II/include/deal.II/base/geometry_info.h
index ea6d4b11f1cc4c79dc2646f2a453c894955360fe..ced3b187defddbc45b4e949bafb71df48ffce42d 100644 (file)
--- 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 5765bb6826fcb1777164b20e2481e7f12c941acf..6569451117892e39f132f8dbae4b30ad6a8dee47 100644 (file)
--- 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 <int dim> const unsigned int GeometryInfo<dim>::max_children_per_cell;
 template <int dim> const unsigned int GeometryInfo<dim>::faces_per_cell;
 template <int dim> const unsigned int GeometryInfo<dim>::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 <int dim> constexpr unsigned int GeometryInfo<dim>::vertices_per_cell;
-#else
-  template <int dim> const unsigned int GeometryInfo<dim>::vertices_per_cell;
-#endif
+template <int dim> const unsigned int GeometryInfo<dim>::vertices_per_cell;
 template <int dim> const unsigned int GeometryInfo<dim>::vertices_per_face;
 template <int dim> const unsigned int GeometryInfo<dim>::lines_per_face;
 template <int dim> const unsigned int GeometryInfo<dim>::quads_per_face;