diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 23:31:49 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 23:31:49 +0000 |
| commit | 03bb87a0175289274132a0240628936fbccf6ca5 (patch) | |
| tree | 979519e873c0ceff7a6a8b0f53252a4a5ece1143 /src/libavoid/assertions.h | |
| parent | Improving CR feedback. thanks! (diff) | |
| parent | When running without installing, extensions will spawn correct Inkscape (diff) | |
| download | inkscape-03bb87a0175289274132a0240628936fbccf6ca5.tar.gz inkscape-03bb87a0175289274132a0240628936fbccf6ca5.zip | |
Merge https://gitlab.com/inkscape/inkscape into selectable-knots
Diffstat (limited to 'src/libavoid/assertions.h')
| -rw-r--r-- | src/libavoid/assertions.h | 15 |
1 files changed, 13 insertions, 2 deletions
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 <mjwybrow@users.sourceforge.net> + * 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<void>(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 <afx.h> + #define COLA_ASSERT(expr) ASSERT(expr) + + #elif defined(USE_ASSERT_EXCEPTIONS) #include "libvpsc/assertions.h" |