Skip to content

Commit b198402

Browse files
leoparenteclaude
andcommitted
chore: revert catch2 upgrade, keep only cpp-httplib and libmaxminddb
catch2 3.14.0 breaks cross-compilation; reverted to 3.8.0. Also revert GeoDB.h disable() and test_geoip.cpp changes that were only needed to handle catch2 3.14.0 randomized test ordering. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent f0b3fa7 commit b198402

3 files changed

Lines changed: 1 addition & 12 deletions

File tree

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Pktvisor(ConanFile):
77
generators = "CMakeToolchain", "CMakeDeps"
88

99
def requirements(self):
10-
self.requires("catch2/3.14.0")
10+
self.requires("catch2/3.8.0")
1111
self.requires("corrade/2020.06")
1212
self.requires("cpp-httplib/0.39.0")
1313
self.requires("docopt.cpp/0.6.3")

src/GeoDB.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,6 @@ class MaxmindDB
5757
~MaxmindDB();
5858

5959
void enable(const std::string &database_filename, int cache_size = DEFAULT_CACHE_SIZE);
60-
void disable()
61-
{
62-
if (_enabled) {
63-
MMDB_close(&_mmdb);
64-
_enabled = false;
65-
}
66-
_lru_geo_cache.reset();
67-
_lru_asn_cache.reset();
68-
}
6960
bool enabled() const
7061
{
7162
return _enabled;

src/tests/test_geoip.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ TEST_CASE("GeoIP", "[geoip]")
1313
{
1414
SECTION("Geo enablement")
1515
{
16-
visor::geo::GeoIP().disable();
17-
visor::geo::GeoASN().disable();
1816
CHECK(!visor::geo::GeoIP().enabled());
1917
CHECK_THROWS(visor::geo::GeoIP().enable("nonexistent.mmdb"));
2018
CHECK(!visor::geo::GeoIP().enabled());

0 commit comments

Comments
 (0)