From: Wolfgang Bangerth Date: Sat, 6 Feb 2021 16:34:28 +0000 (-0700) Subject: Work around limitations of GCC 5.4 with constexpr. X-Git-Tag: v9.3.0-rc1~495^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aa953c535bf3bddfa5de441d3c311bac9b27530;p=dealii.git Work around limitations of GCC 5.4 with constexpr. --- diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h index 1a466465f6..309bd16e17 100644 --- a/include/deal.II/grid/reference_cell.h +++ b/include/deal.II/grid/reference_cell.h @@ -60,8 +60,8 @@ namespace internal * but we have this one function in an internal namespace that is a friend * of the class and can be used to create the objects. */ - constexpr dealii::ReferenceCell - make_reference_cell_from_int(const std::uint8_t kind); + DEAL_II_CONSTEXPR dealii::ReferenceCell + make_reference_cell_from_int(const std::uint8_t kind); } // namespace ReferenceCell } // namespace internal @@ -297,8 +297,8 @@ private: * A kind of constructor -- not quite private because it can be * called by anyone, but at least hidden in an internal namespace. */ - friend constexpr ReferenceCell - internal::ReferenceCell::make_reference_cell_from_int(const std::uint8_t); + friend DEAL_II_CONSTEXPR ReferenceCell + internal::ReferenceCell::make_reference_cell_from_int(const std::uint8_t); }; @@ -342,8 +342,8 @@ namespace internal { namespace ReferenceCell { - constexpr dealii::ReferenceCell - make_reference_cell_from_int(const std::uint8_t kind) + DEAL_II_CONSTEXPR dealii::ReferenceCell + make_reference_cell_from_int(const std::uint8_t kind) { // Make sure these are the only indices from which objects can be // created. @@ -356,6 +356,9 @@ namespace internal } } // namespace ReferenceCell } // namespace internal + + + template inline void ReferenceCell::serialize(Archive &archive, const unsigned int /*version*/)