diff options
author | Alyssa Milburn | 2011-11-17 12:44:05 +0100 |
---|---|---|
committer | Alyssa Milburn | 2011-11-17 12:46:44 +0100 |
commit | 5647637ea2d239681a9dc0facc4071e33235fe4f (patch) | |
tree | c07cd3e97a245a76767b5929f5a54dd4f2c48896 /common/memory.h | |
parent | 51f51a968bedd35528a7756dfcdbb6875ddf2963 (diff) | |
download | scummvm-rg350-5647637ea2d239681a9dc0facc4071e33235fe4f.tar.gz scummvm-rg350-5647637ea2d239681a9dc0facc4071e33235fe4f.tar.bz2 scummvm-rg350-5647637ea2d239681a9dc0facc4071e33235fe4f.zip |
COMMON: Move <new> include into scummsys.h.
The header contains forbidden symbols on some platforms, and the
simplest solution seems to be to include it here. This also includes
it from all the portdefs.h files, except the Symbian one. Probably
the FIXME and the #if can be removed once it's known to work.
Diffstat (limited to 'common/memory.h')
-rw-r--r-- | common/memory.h | 10 |
1 files changed, 0 insertions, 10 deletions
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 { /** |