diff options
| -rw-r--r-- | backends/platform/bada/portdefs.h | 1 | ||||
| -rw-r--r-- | backends/platform/dc/portdefs.h | 1 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/portdefs.h | 1 | ||||
| -rw-r--r-- | backends/platform/n64/portdefs.h | 1 | ||||
| -rw-r--r-- | backends/platform/psp/portdefs.h | 1 | ||||
| -rw-r--r-- | backends/platform/wince/portdefs.h | 1 | ||||
| -rw-r--r-- | common/memory.h | 10 | ||||
| -rw-r--r-- | common/scummsys.h | 9 |
8 files changed, 15 insertions, 10 deletions
diff --git a/backends/platform/bada/portdefs.h b/backends/platform/bada/portdefs.h index e85d578678..7d85a9ec35 100644 --- a/backends/platform/bada/portdefs.h +++ b/backends/platform/bada/portdefs.h @@ -30,6 +30,7 @@ #include <stdio.h> #include <unistd.h> #include <math.h> +#include <new> #define M_PI 3.14159265358979323846 diff --git a/backends/platform/dc/portdefs.h b/backends/platform/dc/portdefs.h index ca2b5208a3..1f5c8f566a 100644 --- a/backends/platform/dc/portdefs.h +++ b/backends/platform/dc/portdefs.h @@ -29,6 +29,7 @@ #include <assert.h> #include <ctype.h> #include <math.h> +#include <new> #ifndef RONIN_TIMER_ACCESS #define Timer ronin_Timer #endif diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h index f512ce3ea2..e40849a513 100644 --- a/backends/platform/ds/arm9/source/portdefs.h +++ b/backends/platform/ds/arm9/source/portdefs.h @@ -37,6 +37,7 @@ #include <stdarg.h> #include <ctype.h> #include <math.h> +#include <new> #define double float diff --git a/backends/platform/n64/portdefs.h b/backends/platform/n64/portdefs.h index 677ad48477..10f5ed6488 100644 --- a/backends/platform/n64/portdefs.h +++ b/backends/platform/n64/portdefs.h @@ -31,6 +31,7 @@ #include <stdio.h> #include <ctype.h> #include <math.h> +#include <new> #undef assert #define assert(x) ((x) ? 0 : (print_error("ASSERT TRIGGERED:\n\n("#x")\n%s\nline: %d", __FILE__, __LINE__))) diff --git a/backends/platform/psp/portdefs.h b/backends/platform/psp/portdefs.h index e8a28b31e2..620a27a601 100644 --- a/backends/platform/psp/portdefs.h +++ b/backends/platform/psp/portdefs.h @@ -38,6 +38,7 @@ #include <time.h> #include <ctype.h> #include <assert.h> +#include <new> #include <pspkernel.h> #include <pspdebug.h> diff --git a/backends/platform/wince/portdefs.h b/backends/platform/wince/portdefs.h index 93df6cd39e..289406c2a4 100644 --- a/backends/platform/wince/portdefs.h +++ b/backends/platform/wince/portdefs.h @@ -73,6 +73,7 @@ #include <mmsystem.h> #include <ctype.h> //#include <direct.h> +#include <new> #ifdef __MINGW32CE__ void *bsearch(const void *, const void *, size_t, size_t, int (*x)(const void *, const void *)); diff --git a/common/memory.h b/common/memory.h index 1870850d27..0e5a97c20b 100644 --- a/common/memory.h +++ b/common/memory.h @@ -24,16 +24,6 @@ #include "common/scummsys.h" -// FIXME: We sadly can't assume standard C++ headers to be present on every -// system we support, so we should get rid of this. The solution should be to -// write a simple placement new on our own. It might be noteworthy we can't -// easily do that for systems which do have a <new>, since it might clash with -// the default definition otherwise! -// Symbian does not have <new> but the new operator -#if !defined(__SYMBIAN32__) -#include <new> -#endif - namespace Common { /** diff --git a/common/scummsys.h b/common/scummsys.h index fbd5bb5273..6baab7c16f 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -130,6 +130,15 @@ #define _USE_MATH_DEFINES #include <math.h> + // FIXME: We sadly can't assume standard C++ headers to be present on every + // system we support, so we should get rid of this. The solution should be to + // write a simple placement new on our own. It might be noteworthy we can't + // easily do that for systems which do have a <new>, since it might clash with + // the default definition otherwise! + // Symbian does not have <new> but the new operator + #if !defined(__SYMBIAN32__) + #include <new> + #endif #endif |