Skip to content

Commit

Permalink
Support older GCC versions
Browse files Browse the repository at this point in the history
Pre-version 11 results in errors like

    error: call of overloaded 'Sqids(<brace-enclosed initializer list>)' is ambiguous
  • Loading branch information
NicoMoser authored Nov 26, 2023
1 parent 19de1a5 commit 3de1a44
Showing 1 changed file with 21 additions and 2 deletions.
23 changes: 21 additions & 2 deletions tests/blocklistTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,30 @@ TEST(Blocklist, IfNoCustomBlocklistParamUseTheDefaultBlocklist) {
}

TEST(Blocklist, IfAnEmptyBlocklistParamPassedDontUseAnyBlocklist) {
#if __GNUC__ <= 10
sqidscxx::SqidsOptions sqidsOptions;
sqidsOptions.blocklist.clear();
sqidscxx::Sqids<> sqids(sqidsOptions);
#else
sqidscxx::Sqids<> sqids({ blocklist: {} });

#endif

EXPECT_EQ(sqids.decode("aho1e"), sqids.numbers({ 4572721 }));
EXPECT_EQ(sqids.encode({ 4572721 }), "aho1e");
}

TEST(Blocklist, IfANonEmptyBlocklistParamPassedUseOnlyThat) {
#if __GNUC__ <= 10
sqidscxx::SqidsOptions sqidsOptions;
sqidsOptions.blocklist.clear();
sqidsOptions.blocklist.insert("ArUO");
sqidscxx::Sqids<> sqids(sqidsOptions);
#else
sqidscxx::Sqids<> sqids({ blocklist: {
"ArUO" // originally encoded [100000]
} });

#endif

// Make sure we don't use the default blocklist
EXPECT_EQ(sqids.decode("aho1e"), sqids.numbers({ 4572721 }));
EXPECT_EQ(sqids.encode({ 4572721 }), "aho1e");
Expand Down Expand Up @@ -54,7 +67,13 @@ TEST(Blocklist, DecodingBlocklistWordsShouldStillWork) {
}

TEST(Blocklist, MatchAgainstAShortBlocklistWord) {
#if __GNUC__ <= 10
sqidscxx::SqidsOptions sqidsOptions;
sqidsOptions.blocklist.insert("pnd");
sqidscxx::Sqids<> sqids(sqidsOptions);
#else
sqidscxx::Sqids<> sqids({ blocklist: { "pnd" } });
#endif

EXPECT_EQ(sqids.decode(sqids.encode({ 1000 })), sqids.numbers({ 1000 }));
}
Expand Down

0 comments on commit 3de1a44

Please sign in to comment.