--- parser3/src/include/pa_memory.h	2015/06/01 00:03:35	1.24
+++ parser3/src/include/pa_memory.h	2017/11/15 22:48:57	1.32
@@ -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 <paf@design.ru> (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.32 2017/11/15 22:48:57 moko Exp $"
 
 // include
 
@@ -70,60 +70,37 @@ inline void *pa_realloc(void *ptr, size_
 	return pa_fail_alloc("reallocate to", 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) throw (std::bad_alloc) {
-	return pa_malloc(size);
-}
-inline void operator delete[] (void *ptr) throw() {
-	pa_free(ptr);
-}
-//}@
-
-//{@ 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);
-}
-//}@
-
-#ifndef _MSC_VER
-// disabled from accidental use
-
-void *calloc_disabled();
-void *malloc_disabled();
-void *realloc_disabled();
-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 char *strdup(const char*, size_t){ return strdup_disabled(); }
-#endif
-
 /// memory allocation/dallocation goes via pa_malloc/pa_free.
 class PA_Allocated {
 public:
 	/// the sole: instances allocated using our functions
-	static void *operator new(size_t size) { 
+	static void *operator new(size_t size) {
 		return pa_malloc(size);
 	}
 	static void operator delete(void *ptr) {
 		pa_free(ptr);
 	}
+	static void *operator new[](size_t size) {
+		return pa_malloc(size);
+	}
+	static void operator delete[](void *ptr) {
+		pa_free(ptr);
+	}
 };
 
+// new(PointerFreeGC)/new(PointerGC) should be used to allocate types not inherited from PA_Allocated
+
+#define PointerFreeGC (true)
+#define PointerGC (false)
+
+inline void *operator new[] (size_t size, bool pointer_free) {
+	return pointer_free ? pa_malloc_atomic(size) : pa_malloc(size);
+}
+
+inline void *operator new (size_t size, bool pointer_free) {
+	return pointer_free ? pa_malloc_atomic(size) : pa_malloc(size);
+}
+
 /// Base for all Parser classes
 typedef PA_Allocated PA_Object;
 
@@ -132,4 +109,39 @@ typedef PA_Allocated PA_Object;
 #define override
 #define rethrow throw
 
+#if defined(_MSC_VER) || (__cplusplus>=201103L)
+#define PA_THROW(what)
+#else
+#define PA_THROW(what) throw(what)
+#endif
+
+#ifndef _MSC_VER
+
+// regular new/delete are disabled from accidental use
+
+void *new_disabled();
+void delete_disabled();
+
+inline void *operator new[] (std::size_t size) PA_THROW(std::bad_alloc){ return new_disabled(); }
+inline void operator delete[](void *ptr) throw(){ delete_disabled(); }
+
+inline void *operator new(std::size_t size) PA_THROW(std::bad_alloc){ return new_disabled(); }
+inline void operator delete(void *ptr) throw(){ delete_disabled(); }
+
+// other regular allocators as disabled from accidental use as well
+
+void *calloc_disabled();
+void *malloc_disabled();
+void *realloc_disabled();
+void free_disabled();
+char *strdup_disabled();
+
+inline void *calloc(size_t) { return calloc_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
+
 #endif