--- parser3/src/include/pa_memory.h 2015/10/12 14:36:56 1.26 +++ parser3/src/include/pa_memory.h 2017/02/08 13:05:46 1.31 @@ -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.26 2015/10/12 14:36:56 moko Exp $" +#define IDENT_PA_MEMORY_H "$Id: pa_memory.h,v 1.31 2017/02/08 13:05:46 moko Exp $" // include @@ -70,7 +70,7 @@ inline void *pa_realloc(void *ptr, size_ return pa_fail_alloc("reallocate to", size); } -#ifdef _MSC_VER +#if defined(_MSC_VER) || (__cplusplus>=201103L) #define PA_THROW(what) #else #define PA_THROW(what) throw(what) @@ -79,27 +79,15 @@ inline void *pa_realloc(void *ptr, size_ #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) PA_THROW(std::bad_alloc) { - return pa_malloc(size); -} -inline void operator delete[] (void *ptr) PA_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) PA_THROW(std::bad_alloc) { - return pa_malloc(size); -} -inline void operator delete(void *ptr) PA_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