--- parser3/src/include/pa_memory.h 2015/06/01 00:03:35 1.24 +++ parser3/src/include/pa_memory.h 2017/02/07 22:00:34 1.30 @@ -1,7 +1,7 @@ /** @file Parser: memory reference counting classes decls. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -9,7 +9,7 @@ #ifndef PA_MEMORY_H #define PA_MEMORY_H -#define IDENT_PA_MEMORY_H "$Id: pa_memory.h,v 1.24 2015/06/01 00:03:35 moko Exp $" +#define IDENT_PA_MEMORY_H "$Id: pa_memory.h,v 1.30 2017/02/07 22:00:34 moko Exp $" // include @@ -70,30 +70,24 @@ inline void *pa_realloc(void *ptr, size_ return pa_fail_alloc("reallocate to", size); } +#ifdef _MSC_VER +#define PA_THROW(what) +#else +#define PA_THROW(what) throw(what) +#endif + #define PointerFreeGC (true) //{@ Array-oriented -inline void *operator new[] (size_t size, bool) { // PointerFreeGC - return pa_malloc_atomic(size); -} -inline void *operator new[] (std::size_t size) throw (std::bad_alloc) { - return pa_malloc(size); -} -inline void operator delete[] (void *ptr) throw() { - pa_free(ptr); -} +void *operator new[] (size_t size, bool); // PointerFreeGC +void *operator new[] (std::size_t size) PA_THROW(std::bad_alloc); +void operator delete[] (void *ptr) throw(); //}@ //{@ Structure-oriented -inline void *operator new (size_t size, bool) { // PointerFreeGC - return pa_malloc_atomic(size); -} -inline void *operator new(std::size_t size) throw (std::bad_alloc) { - return pa_malloc(size); -} -inline void operator delete(void *ptr) throw() { - pa_free(ptr); -} +void *operator new (size_t size, bool); // PointerFreeGC +void *operator new(std::size_t size) PA_THROW(std::bad_alloc); +void operator delete(void *ptr) throw(); //}@ #ifndef _MSC_VER @@ -106,9 +100,9 @@ void free_disabled(); char *strdup_disabled(); inline void *calloc(size_t) { return calloc_disabled(); } -inline void *malloc(size_t) throw() { return malloc_disabled(); } -inline void *realloc(void *, size_t) throw() { return realloc_disabled(); } -inline void free(void *) throw() { free_disabled(); } +inline void *malloc(size_t) { return malloc_disabled(); } +inline void *realloc(void *, size_t) { return realloc_disabled(); } +inline void free(void *) { free_disabled(); } inline char *strdup(const char*, size_t){ return strdup_disabled(); } #endif