Skip to content

Commit c3015c8

Browse files
maxbachmannmaxbachmann
committed
remove constexpr on multiline functions for C++11
1 parent ae22db4 commit c3015c8

File tree

7 files changed

+28
-17
lines changed

7 files changed

+28
-17
lines changed

‎.github/workflows/linux-simple.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ jobs:
77
name: ${{matrix.compiler.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
88
runs-on: ubuntu-20.04
99
strategy:
10+
fail-fast: false
1011
matrix:
1112
compiler:
1213
- {cxx: g++-5, other_pkgs: g++-5}

‎extras/rapidfuzz_amalgamated.hpp

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed under the MIT License <http://opensource.org/licenses/MIT>.
22
// SPDX-License-Identifier: MIT
33
// RapidFuzz v1.0.2
4-
// Generated: 2024-12-25 11:29:11.666527
4+
// Generated: 2024-12-25 11:44:52.213162
55
// ----------------------------------------------------------
66
// This file is an amalgamation of multiple different files.
77
// You probably shouldn't edit it directly.
@@ -5074,7 +5074,7 @@ struct MultiLCSseq : public detail::MultiSimilarityBase<MultiLCSseq<MaxLen>, siz
50745074
friend detail::MultiSimilarityBase<MultiLCSseq<MaxLen>, size_t, 0, std::numeric_limits<int64_t>::max()>;
50755075
friend detail::MultiNormalizedMetricBase<MultiLCSseq<MaxLen>, size_t>;
50765076

5077-
constexpr static size_t get_vec_size()
5077+
RAPIDFUZZ_CONSTEXPR_CXX14 static size_t get_vec_size()
50785078
{
50795079
# ifdef RAPIDFUZZ_AVX2
50805080
using namespace detail::simd_avx2;
@@ -5093,7 +5093,7 @@ struct MultiLCSseq : public detail::MultiSimilarityBase<MultiLCSseq<MaxLen>, siz
50935093
static_assert(MaxLen <= 64, "expected MaxLen <= 64");
50945094
}
50955095

5096-
constexpr static size_t find_block_count(size_t count)
5096+
static size_t find_block_count(size_t count)
50975097
{
50985098
size_t vec_size = get_vec_size();
50995099
size_t simd_vec_count = detail::ceil_div(count, vec_size);
@@ -5559,7 +5559,12 @@ static inline size_t count_common_chars(const FlaggedCharsMultiword& flagged)
55595559
}
55605560

55615561
template <typename PM_Vec, typename InputIt1, typename InputIt2>
5562-
static inline FlaggedCharsWord flag_similar_characters_word(const PM_Vec& PM, const Range<InputIt1>&,
5562+
static inline FlaggedCharsWord flag_similar_characters_word(const PM_Vec& PM,
5563+
#ifdef NDEBUG
5564+
const Range<InputIt1>&,
5565+
#else
5566+
const Range<InputIt1>& P,
5567+
#endif
55635568
const Range<InputIt2>& T, size_t Bound)
55645569
{
55655570
assert(P.size() <= 64);
@@ -6415,7 +6420,7 @@ struct MultiJaro : public detail::MultiSimilarityBase<MultiJaro<MaxLen>, double,
64156420
# endif
64166421
}
64176422

6418-
constexpr static size_t find_block_count(size_t count)
6423+
static size_t find_block_count(size_t count)
64196424
{
64206425
size_t vec_size = get_vec_size();
64216426
size_t simd_vec_count = detail::ceil_div(count, vec_size);
@@ -8396,7 +8401,7 @@ struct MultiLevenshtein : public detail::MultiDistanceBase<MultiLevenshtein<MaxL
83968401
std::numeric_limits<int64_t>::max()>;
83978402
friend detail::MultiNormalizedMetricBase<MultiLevenshtein<MaxLen>, size_t>;
83988403

8399-
constexpr static size_t get_vec_size()
8404+
RAPIDFUZZ_CONSTEXPR_CXX14 static size_t get_vec_size()
84008405
{
84018406
# ifdef RAPIDFUZZ_AVX2
84028407
using namespace detail::simd_avx2;
@@ -8415,7 +8420,7 @@ struct MultiLevenshtein : public detail::MultiDistanceBase<MultiLevenshtein<MaxL
84158420
static_assert(MaxLen <= 64, "expected MaxLen <= 64");
84168421
}
84178422

8418-
constexpr static size_t find_block_count(size_t count)
8423+
static size_t find_block_count(size_t count)
84198424
{
84208425
size_t vec_size = get_vec_size();
84218426
size_t simd_vec_count = detail::ceil_div(count, vec_size);
@@ -8967,7 +8972,7 @@ struct MultiOSA
89678972
friend detail::MultiDistanceBase<MultiOSA<MaxLen>, size_t, 0, std::numeric_limits<int64_t>::max()>;
89688973
friend detail::MultiNormalizedMetricBase<MultiOSA<MaxLen>, size_t>;
89698974

8970-
constexpr static size_t get_vec_size()
8975+
RAPIDFUZZ_CONSTEXPR_CXX14 static size_t get_vec_size()
89718976
{
89728977
# ifdef RAPIDFUZZ_AVX2
89738978
using namespace detail::simd_avx2;
@@ -8986,7 +8991,7 @@ struct MultiOSA
89868991
static_assert(MaxLen <= 64, "expected MaxLen <= 64");
89878992
}
89888993

8989-
constexpr static size_t find_block_count(size_t count)
8994+
static size_t find_block_count(size_t count)
89908995
{
89918996
size_t vec_size = get_vec_size();
89928997
size_t simd_vec_count = detail::ceil_div(count, vec_size);

‎rapidfuzz/distance/Jaro.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ struct MultiJaro : public detail::MultiSimilarityBase<MultiJaro<MaxLen>, double,
9696
# endif
9797
}
9898

99-
constexpr static size_t find_block_count(size_t count)
99+
static size_t find_block_count(size_t count)
100100
{
101101
size_t vec_size = get_vec_size();
102102
size_t simd_vec_count = detail::ceil_div(count, vec_size);

‎rapidfuzz/distance/Jaro_impl.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,12 @@ static inline size_t count_common_chars(const FlaggedCharsMultiword& flagged)
9292
}
9393

9494
template <typename PM_Vec, typename InputIt1, typename InputIt2>
95-
static inline FlaggedCharsWord flag_similar_characters_word(const PM_Vec& PM, const Range<InputIt1>&,
95+
static inline FlaggedCharsWord flag_similar_characters_word(const PM_Vec& PM,
96+
#ifdef NDEBUG
97+
const Range<InputIt1>&,
98+
#else
99+
const Range<InputIt1>& P,
100+
#endif
96101
const Range<InputIt2>& T, size_t Bound)
97102
{
98103
assert(P.size() <= 64);

‎rapidfuzz/distance/LCSseq.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct MultiLCSseq : public detail::MultiSimilarityBase<MultiLCSseq<MaxLen>, siz
8383
friend detail::MultiSimilarityBase<MultiLCSseq<MaxLen>, size_t, 0, std::numeric_limits<int64_t>::max()>;
8484
friend detail::MultiNormalizedMetricBase<MultiLCSseq<MaxLen>, size_t>;
8585

86-
constexpr static size_t get_vec_size()
86+
RAPIDFUZZ_CONSTEXPR_CXX14 static size_t get_vec_size()
8787
{
8888
# ifdef RAPIDFUZZ_AVX2
8989
using namespace detail::simd_avx2;
@@ -102,7 +102,7 @@ struct MultiLCSseq : public detail::MultiSimilarityBase<MultiLCSseq<MaxLen>, siz
102102
static_assert(MaxLen <= 64, "expected MaxLen <= 64");
103103
}
104104

105-
constexpr static size_t find_block_count(size_t count)
105+
static size_t find_block_count(size_t count)
106106
{
107107
size_t vec_size = get_vec_size();
108108
size_t simd_vec_count = detail::ceil_div(count, vec_size);

‎rapidfuzz/distance/Levenshtein.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ struct MultiLevenshtein : public detail::MultiDistanceBase<MultiLevenshtein<MaxL
304304
std::numeric_limits<int64_t>::max()>;
305305
friend detail::MultiNormalizedMetricBase<MultiLevenshtein<MaxLen>, size_t>;
306306

307-
constexpr static size_t get_vec_size()
307+
RAPIDFUZZ_CONSTEXPR_CXX14 static size_t get_vec_size()
308308
{
309309
# ifdef RAPIDFUZZ_AVX2
310310
using namespace detail::simd_avx2;
@@ -323,7 +323,7 @@ struct MultiLevenshtein : public detail::MultiDistanceBase<MultiLevenshtein<MaxL
323323
static_assert(MaxLen <= 64, "expected MaxLen <= 64");
324324
}
325325

326-
constexpr static size_t find_block_count(size_t count)
326+
static size_t find_block_count(size_t count)
327327
{
328328
size_t vec_size = get_vec_size();
329329
size_t simd_vec_count = detail::ceil_div(count, vec_size);

‎rapidfuzz/distance/OSA.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ struct MultiOSA
119119
friend detail::MultiDistanceBase<MultiOSA<MaxLen>, size_t, 0, std::numeric_limits<int64_t>::max()>;
120120
friend detail::MultiNormalizedMetricBase<MultiOSA<MaxLen>, size_t>;
121121

122-
constexpr static size_t get_vec_size()
122+
RAPIDFUZZ_CONSTEXPR_CXX14 static size_t get_vec_size()
123123
{
124124
# ifdef RAPIDFUZZ_AVX2
125125
using namespace detail::simd_avx2;
@@ -138,7 +138,7 @@ struct MultiOSA
138138
static_assert(MaxLen <= 64, "expected MaxLen <= 64");
139139
}
140140

141-
constexpr static size_t find_block_count(size_t count)
141+
static size_t find_block_count(size_t count)
142142
{
143143
size_t vec_size = get_vec_size();
144144
size_t simd_vec_count = detail::ceil_div(count, vec_size);

0 commit comments

Comments
 (0)