diff options
| author | joerg <joerg@pkgsrc.org> | 2013-12-18 17:55:15 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-12-18 17:55:15 +0000 |
| commit | d9c4d35089da3d97395c8976cb7945dd2c58dc23 (patch) | |
| tree | 8fddfe03482045d5ee44820a583c2f49e2d7dac5 /emulators | |
| parent | 0461889a5563a00b11d1835a490e2895103b9f1b (diff) | |
| download | pkgsrc-d9c4d35089da3d97395c8976cb7945dd2c58dc23.tar.gz | |
ISO C++ says that replacements for operator new/delete must be global.
So don't define inline versions of them.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/mame/distinfo | 3 | ||||
| -rw-r--r-- | emulators/mame/patches/patch-src_emu_emualloc.h | 20 | ||||
| -rw-r--r-- | emulators/mess/distinfo | 3 | ||||
| -rw-r--r-- | emulators/mess/patches/patch-src_emu_emualloc.h | 20 |
4 files changed, 44 insertions, 2 deletions
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo index 57eeb7dc2bc..98c585f0a0c 100644 --- a/emulators/mame/distinfo +++ b/emulators/mame/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.16 2013/11/14 08:18:21 wiz Exp $ +$NetBSD: distinfo,v 1.17 2013/12/18 17:55:15 joerg Exp $ SHA1 (mame0151s.zip) = 94a0a4ac865d7453cf6e8fbc40bc86a9e12b8a52 RMD160 (mame0151s.zip) = 3e7ce1b9acf9735612a0bfb166b980463ce3a5ca Size (mame0151s.zip) = 36052471 bytes +SHA1 (patch-src_emu_emualloc.h) = 22cdfbc002cda8053125ef8cedf3bcceea04deaf SHA1 (patch-src_osd_sdl_sdl.mak) = e4eacee6ab6c4a889dde0649ebe091970ece9624 diff --git a/emulators/mame/patches/patch-src_emu_emualloc.h b/emulators/mame/patches/patch-src_emu_emualloc.h new file mode 100644 index 00000000000..3e07260b3e7 --- /dev/null +++ b/emulators/mame/patches/patch-src_emu_emualloc.h @@ -0,0 +1,20 @@ +$NetBSD: patch-src_emu_emualloc.h,v 1.1 2013/12/18 17:55:15 joerg Exp $ + +--- src/emu/emualloc.h.orig 2013-10-16 09:14:50.000000000 +0000 ++++ src/emu/emualloc.h +@@ -77,6 +77,7 @@ void dump_unfreed_mem(); + // zeromem_t is a dummy class used to tell new to zero memory after allocation + class zeromem_t { }; + ++#if 0 + #ifndef NO_MEM_TRACKING + + // standard new/delete operators (try to avoid using) +@@ -109,6 +110,7 @@ ATTR_FORCE_INLINE inline void operator d + } + + #endif ++#endif + + // file/line new/delete operators + ATTR_FORCE_INLINE inline void *operator new(std::size_t size, const char *file, int line) throw (std::bad_alloc) diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo index 754b7e27edb..908a1153ccc 100644 --- a/emulators/mess/distinfo +++ b/emulators/mess/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.15 2013/11/14 08:18:21 wiz Exp $ +$NetBSD: distinfo,v 1.16 2013/12/18 17:55:15 joerg Exp $ SHA1 (mame0151s.zip) = 94a0a4ac865d7453cf6e8fbc40bc86a9e12b8a52 RMD160 (mame0151s.zip) = 3e7ce1b9acf9735612a0bfb166b980463ce3a5ca Size (mame0151s.zip) = 36052471 bytes +SHA1 (patch-src_emu_emualloc.h) = f968c3499684a87e36a14f9a4d966ea22aa5126c SHA1 (patch-src_osd_sdl_sdl.mak) = e4eacee6ab6c4a889dde0649ebe091970ece9624 diff --git a/emulators/mess/patches/patch-src_emu_emualloc.h b/emulators/mess/patches/patch-src_emu_emualloc.h new file mode 100644 index 00000000000..2747e3b61f7 --- /dev/null +++ b/emulators/mess/patches/patch-src_emu_emualloc.h @@ -0,0 +1,20 @@ +$NetBSD: patch-src_emu_emualloc.h,v 1.1 2013/12/18 17:55:15 joerg Exp $ + +--- src/emu/emualloc.h.orig 2013-12-18 13:39:10.000000000 +0000 ++++ src/emu/emualloc.h +@@ -77,6 +77,7 @@ void dump_unfreed_mem(); + // zeromem_t is a dummy class used to tell new to zero memory after allocation + class zeromem_t { }; + ++#if 0 + #ifndef NO_MEM_TRACKING + + // standard new/delete operators (try to avoid using) +@@ -109,6 +110,7 @@ ATTR_FORCE_INLINE inline void operator d + } + + #endif ++#endif + + // file/line new/delete operators + ATTR_FORCE_INLINE inline void *operator new(std::size_t size, const char *file, int line) throw (std::bad_alloc) |