From fd733201b82f39655488a286c89142f321ef9dc9 Mon Sep 17 00:00:00 2001 From: Sylvain Chiron Date: Sat, 1 Jul 2017 13:36:41 +0200 Subject: Updated libs from the Adaptagrams project: libavoid, libcola and libvspc; changed the code to match the new API Signed-off-by: Sylvain Chiron --- src/libavoid/assertions.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/libavoid/assertions.h') diff --git a/src/libavoid/assertions.h b/src/libavoid/assertions.h index 0725c4482..17156225a 100644 --- a/src/libavoid/assertions.h +++ b/src/libavoid/assertions.h @@ -19,19 +19,30 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * Author(s): Michael Wybrow + * Author(s): Michael Wybrow */ #ifndef AVOID_ASSERTIONS_H #define AVOID_ASSERTIONS_H +#define COLA_UNUSED(expr) do { (void)(expr); } while (0) + #ifdef NDEBUG #define COLA_ASSERT(expr) static_cast(0) #else // Not NDEBUG - #if defined(USE_ASSERT_EXCEPTIONS) + #ifdef _MSC_VER + // Compiling with Microsoft Visual C++ compiler + + // Prevent inclusion of min and max macros. + #define NOMINMAX + + #include + #define COLA_ASSERT(expr) ASSERT(expr) + + #elif defined(USE_ASSERT_EXCEPTIONS) #include "libvpsc/assertions.h" -- cgit v1.2.3