--- parser3/src/include/pa_memory.h	2015/04/21 23:23:34	1.22
+++ parser3/src/include/pa_memory.h	2015/10/26 01:21:56	1.28
@@ -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-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
@@ -9,12 +9,13 @@
 #ifndef PA_MEMORY_H
 #define PA_MEMORY_H
 
-#define IDENT_PA_MEMORY_H "$Id: pa_memory.h,v 1.22 2015/04/21 23:23:34 moko Exp $"
+#define IDENT_PA_MEMORY_H "$Id: pa_memory.h,v 1.28 2015/10/26 01:21:56 moko Exp $"
 
 // include
 
 #include "pa_config_includes.h"
 #include "gc.h"
+#include <new>
 
 // define destructors use for Array, Hash and VMethodFrame
 #define USE_DESTRUCTORS
@@ -69,33 +70,39 @@ 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) {
-	return pa_malloc(size);
-}
 inline void *operator new[] (size_t size, bool) { // PointerFreeGC
 	return pa_malloc_atomic(size);
 }
-inline void operator delete[] (void *ptr) {
+inline void *operator new[] (std::size_t size) PA_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) {
-	return pa_malloc(size);
-}
 inline void *operator new (size_t size, bool) { // PointerFreeGC
 	return pa_malloc_atomic(size);
 }
-inline void operator delete(void *ptr) {
+inline void *operator new(std::size_t size) PA_THROW(std::bad_alloc) {
+	return pa_malloc(size);
+}
+inline void operator delete(void *ptr) throw() {
 	pa_free(ptr);
 }
 //}@
 
-#ifndef WIN32
+#ifndef _MSC_VER
 // disabled from accidental use
 
 void *calloc_disabled();
@@ -104,10 +111,10 @@ 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 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