1
0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-06-16 07:07:13 +02:00

Backport MaxmindDB.

This commit is contained in:
Sandu Liviu Catalin
2021-01-31 18:48:31 +02:00
parent ea751be7b1
commit fd2a1de107
88 changed files with 15355 additions and 8 deletions

View File

@ -64,6 +64,7 @@ add_library(SqModule MODULE SqBase.hpp Main.cpp
Library/IO/Buffer.cpp Library/IO/Buffer.hpp
Library/IO/File.cpp Library/IO/File.hpp
Library/IO/INI.cpp Library/IO/INI.hpp
Library/MMDB.cpp Library/MMDB.hpp
Library/Numeric.cpp Library/Numeric.hpp
Library/Numeric/Long.cpp Library/Numeric/Long.hpp
Library/Numeric/Math.cpp Library/Numeric/Math.hpp
@ -105,7 +106,7 @@ if(WIN32 OR MINGW)
target_link_libraries(SqModule wsock32 ws2_32 shlwapi)
endif()
# Link to base libraries
target_link_libraries(SqModule Squirrel FmtLib SimpleINI TinyDir ConcurrentQueue cpr::cpr)
target_link_libraries(SqModule Squirrel FmtLib SimpleINI TinyDir ConcurrentQueue cpr::cpr maxminddb::maxminddb)
# Link to POCO libraries
target_link_libraries(SqModule Poco::Foundation Poco::Encodings Poco::Crypto Poco::Util Poco::Data Poco::Net Poco::JSON Poco::XML Poco::Zip Poco::JWT Poco::Redis Poco::MongoDB)
# Does POCO have SQLite support?
@ -132,7 +133,7 @@ if(POSTGRESQL_FOUND)
target_compile_definitions(SqModule PRIVATE SQMOD_POCO_HAS_POSTGRESQL=1)
endif()
# Determine if build mode
if(CMAKE_BUILD_TYPE MATCHES "(Release)+")
if(${CMAKE_BUILD_TYPE} MATCHES "(Release)+")
target_compile_definitions(SqModule PRIVATE NDEBUG=1)
else()
target_compile_definitions(SqModule PRIVATE _DEBUG=1 SQMOD_EXCEPTLOC=1)

1611
module/Library/MMDB.cpp Normal file

File diff suppressed because it is too large Load Diff

1728
module/Library/MMDB.hpp Normal file

File diff suppressed because it is too large Load Diff

View File

@ -222,7 +222,7 @@ template < class T > struct SqVector
{
if (static_cast< size_t >(i) >= mC->size())
{
STHROWF("Invalid vector container index(" PRINT_INT_FMT ")", i);
STHROWF("Invalid vector container index(%d" PRINT_INT_FMT ")", i);
}
return *mC;
}
@ -234,7 +234,7 @@ template < class T > struct SqVector
{
if (static_cast< size_t >(i) >= mC->size())
{
STHROWF("Invalid vector container index(" PRINT_INT_FMT ")", i);
STHROWF("Invalid vector container index(%d" PRINT_INT_FMT ")", i);
}
return *mC;
}
@ -623,7 +623,7 @@ template < class T > struct SqVector
Validate();
if (static_cast< size_t >(p) >= mC->size())
{
STHROWF("Invalid container index (" PRINT_INT_FMT ")", p);
STHROWF("Invalid container index (%d" PRINT_INT_FMT ")", p);
}
for (auto i = static_cast< size_t >(p); n--; ++i)
{
@ -646,7 +646,7 @@ template < class T > struct SqVector
}
else if (static_cast< size_t >(p + n) >= mC->size())
{
STHROWF("Invalid container index (" PRINT_INT_FMT ")", p + n);
STHROWF("Invalid container index (%d" PRINT_INT_FMT ")", p + n);
}
for (n = (p + n); p <= n; ++p)
{