← Back to branch summary

~ubuntu-branches/ubuntu/precise/mame/precise-proposed

« back to all changes in this revision

Viewing changes to src/emu/emualloc.h

  • Committer: Package Import Robot
  • Author(s): Cesare Falco
  • Date: 2011-11-30 18:50:10 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20111130185010-02hcxybht1mn082w
Tags: 0.144-0ubuntu1
https://launchpad.net/bugs/913550
* New upstream release (LP: #913550)
* mame.install:
  - Added artwork/ images to be used with -effect switch
  - Be more selective with hash/ contents
* contrib/mame.ini: added /usr/share/games/mame/artwork/ to artpath

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/emu/emualloc.h
106
106
// zeromem_t is a dummy class used to tell new to zero memory after allocation
107
107
class zeromem_t { };
108
108
 
 
109
#ifndef NO_MEM_TRACKING
109
110
 
110
111
// standard new/delete operators (try to avoid using)
111
112
ATTR_FORCE_INLINE inline void *operator new(std::size_t size) throw (std::bad_alloc)
136
137
                free_file_line(ptr, NULL, 0);
137
138
}
138
139
 
 
140
#endif
139
141
 
140
142
// file/line new/delete operators
141
143
ATTR_FORCE_INLINE inline void *operator new(std::size_t size, const char *file, int line) throw (std::bad_alloc)
318
320
//  ADDDITIONAL MACROS
319
321
//**************************************************************************
320
322
 
 
323
#ifndef NO_MEM_TRACKING
321
324
// re-route classic malloc-style allocations
322
325
#undef malloc
323
326
#undef calloc
331
334
 
332
335
// disable direct deletion
333
336
#define delete                  __error_use_pool_free_mechanisms__
334
 
 
 
337
#endif
335
338
 
336
339
#endif  /* __EMUALLOC_H__ */