Merge pull request #8 from measurement-kit/fix/mk_build_warnings

Fix warnings when building MK
measurement-kit · Feb 5, 2019 · b4cdebe · b4cdebe
2 parents db6dc85 + 09d8a7e
commit b4cdebe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmake/Modules b/cmake/Modules
diff --git 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
@@ -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