From 7ce021a37683e69145dc5316293780f6e28fad73 Mon Sep 17 00:00:00 2001 From: anders_k Date: Sat, 27 Jul 2013 18:29:36 +0000 Subject: [PATCH] Ignore c++ exception specifications, they are still useful as "documentation" git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6398 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/Platform.h | 2 ++ Source/util.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Platform.h b/Source/Platform.h index d2cba272..e1d7eebb 100644 --- a/Source/Platform.h +++ b/Source/Platform.h @@ -961,4 +961,6 @@ typedef struct tagVS_FIXEDFILEINFO { #endif +#define NSIS_CXX_THROWSPEC(ignoredthrowspec) // Ignore c++ exception specifications + #endif diff --git a/Source/util.cpp b/Source/util.cpp index 959a1391..b22b5f92 100644 --- a/Source/util.cpp +++ b/Source/util.cpp @@ -435,7 +435,7 @@ FILE* my_fopen(const TCHAR *path, const char *mode) } -void *operator new(size_t size) throw(bad_alloc) { +void *operator new(size_t size) NSIS_CXX_THROWSPEC(bad_alloc) { void *p = malloc(size); if (!p) throw bad_alloc();