Merge pull request #3245 from eseiler/misc/remove_gcc14

[MISC] Remove gcc14 workaround
seqan · Feb 28, 2024 · 5de8132 · 5de8132
2 parents 3e63456 + a116af8
commit 5de8132
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 35 deletions.
diff --git a/include/seqan3/alignment/configuration/detail.hpp b/include/seqan3/alignment/configuration/detail.hpp
@@ -50,8 +50,8 @@ enum struct align_config_id : uint8_t
  *                           this table to allow validation checks.
  */
 template <>
-SEQAN3_WORKAROUND_GCC_114013 std::array<std::array<bool, static_cast<uint8_t>(align_config_id::SIZE)>,
-                                        static_cast<uint8_t>(align_config_id::SIZE)>
+inline constexpr std::array<std::array<bool, static_cast<uint8_t>(align_config_id::SIZE)>,
+                            static_cast<uint8_t>(align_config_id::SIZE)>
     compatibility_table<align_config_id>{{
         //band
         //|  debug

diff --git a/include/seqan3/core/platform.hpp b/include/seqan3/core/platform.hpp
@@ -238,17 +238,6 @@ static_assert(sdsl::sdsl_version_major == 3, "Only version 3 of the SDSL is supp
 #    endif
 #endif
 
-/*!\brief Workaround for variable template specialisations not being emitted.
- * \see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114013
- */
-#ifndef SEQAN3_WORKAROUND_GCC_114013
-#    if SEQAN3_COMPILER_IS_GCC && (__GNUC__ == 14)
-#        define SEQAN3_WORKAROUND_GCC_114013 constexpr
-#    else
-#        define SEQAN3_WORKAROUND_GCC_114013 inline constexpr
-#    endif
-#endif
-
 /*!\brief This is needed to support CentOS 7 or RHEL 7; Newer CentOS's include a more modern default-gcc version making
  *        this macro obsolete.
  *

diff --git a/include/seqan3/search/configuration/detail.hpp b/include/seqan3/search/configuration/detail.hpp
@@ -72,8 +72,8 @@ enum struct search_config_id : uint8_t
  * determined by the enum value `SIZE` of seqan3::detail::search_config_id.
  */
 template <>
-SEQAN3_WORKAROUND_GCC_114013 std::array<std::array<bool, static_cast<uint8_t>(search_config_id::SIZE)>,
-                                        static_cast<uint8_t>(search_config_id::SIZE)>
+inline constexpr std::array<std::array<bool, static_cast<uint8_t>(search_config_id::SIZE)>,
+                            static_cast<uint8_t>(search_config_id::SIZE)>
     compatibility_table<search_config_id> = {{
         // max_error_total,
         // |  max_error_substitution,

diff --git a/include/seqan3/search/detail/search_scheme_precomputed.hpp b/include/seqan3/search/detail/search_scheme_precomputed.hpp
@@ -81,63 +81,60 @@ using search_scheme_dyn_type = std::vector<search_dyn>;
  *          seems to be a good greedy approach.
  */
 template <uint8_t min_error, uint8_t max_error>
-SEQAN3_WORKAROUND_GCC_114013 int optimum_search_scheme{0};
+inline constexpr int optimum_search_scheme{0};
 
 //!\cond
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<1, 1> optimum_search_scheme<0, 0>{{{{1}, {0}, {0}}}};
+inline constexpr search_scheme_type<1, 1> optimum_search_scheme<0, 0>{{{{1}, {0}, {0}}}};
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<2, 2> optimum_search_scheme<0, 1>{
+inline constexpr search_scheme_type<2, 2> optimum_search_scheme<0, 1>{
     {{{1, 2}, {0, 0}, {0, 1}}, {{2, 1}, {0, 1}, {0, 1}}}};
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<2, 2> optimum_search_scheme<1, 1>{
+inline constexpr search_scheme_type<2, 2> optimum_search_scheme<1, 1>{
     {{{1, 2}, {0, 1}, {0, 1}}, {{2, 1}, {0, 1}, {0, 1}}}};
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<3, 4> optimum_search_scheme<0, 2>{
-    {{{1, 2, 3, 4}, {0, 0, 1, 1}, {0, 0, 2, 2}},
-     {{3, 2, 1, 4}, {0, 0, 0, 0}, {0, 1, 1, 2}},
-     {{4, 3, 2, 1}, {0, 0, 0, 2}, {0, 1, 2, 2}}}};
+inline constexpr search_scheme_type<3, 4> optimum_search_scheme<0, 2>{{{{1, 2, 3, 4}, {0, 0, 1, 1}, {0, 0, 2, 2}},
+                                                                       {{3, 2, 1, 4}, {0, 0, 0, 0}, {0, 1, 1, 2}},
+                                                                       {{4, 3, 2, 1}, {0, 0, 0, 2}, {0, 1, 2, 2}}}};
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<3, 4> optimum_search_scheme<1, 2>{
-    {{{1, 2, 3, 4}, {0, 0, 0, 1}, {0, 0, 2, 2}},
-     {{3, 2, 1, 4}, {0, 0, 1, 1}, {0, 1, 1, 2}},
-     {{4, 3, 2, 1}, {0, 0, 0, 2}, {0, 1, 2, 2}}}};
+inline constexpr search_scheme_type<3, 4> optimum_search_scheme<1, 2>{{{{1, 2, 3, 4}, {0, 0, 0, 1}, {0, 0, 2, 2}},
+                                                                       {{3, 2, 1, 4}, {0, 0, 1, 1}, {0, 1, 1, 2}},
+                                                                       {{4, 3, 2, 1}, {0, 0, 0, 2}, {0, 1, 2, 2}}}};
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<3, 4> optimum_search_scheme<2, 2>{
-    {{{4, 3, 2, 1}, {0, 0, 1, 2}, {0, 0, 2, 2}},
-     {{2, 3, 4, 1}, {0, 0, 0, 2}, {0, 1, 1, 2}},
-     {{1, 2, 3, 4}, {0, 0, 0, 2}, {0, 1, 2, 2}}}};
+inline constexpr search_scheme_type<3, 4> optimum_search_scheme<2, 2>{{{{4, 3, 2, 1}, {0, 0, 1, 2}, {0, 0, 2, 2}},
+                                                                       {{2, 3, 4, 1}, {0, 0, 0, 2}, {0, 1, 1, 2}},
+                                                                       {{1, 2, 3, 4}, {0, 0, 0, 2}, {0, 1, 2, 2}}}};
 
 // TODO: benchmark whether the first search is really the fastest one (see \details of optimum_search_scheme)
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<4, 5> optimum_search_scheme<0, 3>{
+inline constexpr search_scheme_type<4, 5> optimum_search_scheme<0, 3>{
     {{{5, 4, 3, 2, 1}, {0, 0, 0, 0, 0}, {0, 0, 3, 3, 3}},
      {{3, 4, 5, 2, 1}, {0, 0, 1, 1, 1}, {0, 1, 1, 2, 3}},
      {{2, 3, 4, 5, 1}, {0, 0, 0, 2, 2}, {0, 1, 2, 2, 3}},
      {{1, 2, 3, 4, 5}, {0, 0, 0, 0, 3}, {0, 2, 2, 3, 3}}}};
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<4, 5> optimum_search_scheme<1, 3>{
+inline constexpr search_scheme_type<4, 5> optimum_search_scheme<1, 3>{
     {{{5, 4, 3, 2, 1}, {0, 0, 0, 0, 1}, {0, 0, 3, 3, 3}},
      {{3, 4, 5, 2, 1}, {0, 0, 1, 1, 1}, {0, 1, 1, 2, 3}},
      {{2, 3, 4, 5, 1}, {0, 0, 0, 2, 2}, {0, 1, 2, 2, 3}},
      {{1, 2, 3, 4, 5}, {0, 0, 0, 0, 3}, {0, 2, 2, 3, 3}}}};
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<4, 5> optimum_search_scheme<2, 3>{
+inline constexpr search_scheme_type<4, 5> optimum_search_scheme<2, 3>{
     {{{5, 4, 3, 2, 1}, {0, 0, 0, 0, 2}, {0, 0, 3, 3, 3}},
      {{3, 4, 5, 2, 1}, {0, 0, 1, 1, 2}, {0, 1, 1, 2, 3}},
      {{2, 3, 4, 5, 1}, {0, 0, 0, 2, 2}, {0, 1, 2, 2, 3}},
      {{1, 2, 3, 4, 5}, {0, 0, 0, 0, 3}, {0, 2, 2, 3, 3}}}};
 
 template <>
-SEQAN3_WORKAROUND_GCC_114013 search_scheme_type<4, 5> optimum_search_scheme<3, 3>{
+inline constexpr search_scheme_type<4, 5> optimum_search_scheme<3, 3>{
     {{{5, 4, 3, 2, 1}, {0, 0, 0, 0, 3}, {0, 0, 3, 3, 3}},
      {{3, 4, 5, 2, 1}, {0, 0, 1, 1, 3}, {0, 1, 1, 2, 3}},
      {{2, 3, 4, 5, 1}, {0, 0, 0, 2, 3}, {0, 1, 2, 2, 3}},