diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 37c54e1fdd4..b23bb91ccd9 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -527,10 +527,13 @@ using std::max; // Macro to specify a 'noreturn' attribute. #if defined(__GNUG__) || __has_attribute(__noreturn__) # define CGAL_NORETURN __attribute__ ((__noreturn__)) -#else +#elif defined (_MSC_VER) +# define CGAL_NORETURN __declspec(noreturn) +#else # define CGAL_NORETURN #endif + // Macro CGAL_ASSUME // Call a builtin of the compiler to pass a hint to the compiler #if __has_builtin(__builtin_unreachable) || (CGAL_GCC_VERSION >= 40500 && !__STRICT_ANSI__) diff --git a/STL_Extension/include/CGAL/assertions.h b/STL_Extension/include/CGAL/assertions.h index 892cc39951e..109d703d058 100644 --- a/STL_Extension/include/CGAL/assertions.h +++ b/STL_Extension/include/CGAL/assertions.h @@ -63,9 +63,9 @@ namespace CGAL { // ===================== // failure functions // ----------------- -CGAL_EXPORT void assertion_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; -CGAL_EXPORT void precondition_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; -CGAL_EXPORT void postcondition_fail ( const char*, const char*, int, const char* = "") CGAL_NORETURN; +CGAL_EXPORT CGAL_NORETURN void assertion_fail ( const char*, const char*, int, const char* = "") ; +CGAL_EXPORT CGAL_NORETURN void precondition_fail ( const char*, const char*, int, const char* = "") ; +CGAL_EXPORT CGAL_NORETURN void postcondition_fail ( const char*, const char*, int, const char* = "") ; // warning function // ----------------