From 09d8a7e165c33e6c33565bb83bddffa172827b22 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Tue, 5 Feb 2019 14:13:05 +0000 Subject: [PATCH] Fix warnings when building MK --- cmake/Modules | 2 +- mkmmdb.hpp | 4 ++-- tests.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Modules b/cmake/Modules index 3518195..3de1ed2 160000 --- a/cmake/Modules +++ b/cmake/Modules @@ -1 +1 @@ -Subproject commit 3518195dbbe5ae114033d0d87c917cbdbeb67046 +Subproject commit 3de1ed22cf3cc87ae0fd25a306783cc5ed852af6 diff --git a/mkmmdb.hpp b/mkmmdb.hpp index 627488b..a65c303 100644 --- a/mkmmdb.hpp +++ b/mkmmdb.hpp @@ -223,14 +223,14 @@ static bool MMDB_get_value_check( // MKMMDB_ABORT allows to check in unit tests that we would abort. #ifndef MKMMDB_ABORT -#define MKMMDB_ABORT abort() +#define MKMMDB_ABORT() abort() #endif // MKMMDB_ABORT_IF_NULLPTR calls abort if @p Pointer is nullptr. #define MKMMDB_ABORT_IF_NULLPTR(Pointer) \ do { \ if (Pointer == nullptr) { \ - MKMMDB_ABORT; \ + MKMMDB_ABORT(); \ } \ } while (0) diff --git a/tests.cpp b/tests.cpp index c1f6d97..74a4ddf 100644 --- a/tests.cpp +++ b/tests.cpp @@ -11,7 +11,7 @@ MKMOCK_DEFINE_HOOK(finish_lookup_asn_check, bool); MKMOCK_DEFINE_HOOK(finish_lookup_org_check, bool); // Override MKMMDB_ABORT so we can actually verify we would abort -#define MKMMDB_ABORT throw std::exception() +#define MKMMDB_ABORT() throw std::exception() // Disable noexcept specifier for functions that may MKMMDB_ABORT #define MKMMDB_NOEXCEPT // Nothing