aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/new.cpp
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2013-01-27 12:52:06 +0100
committerCristian Maglie <c.maglie@bug.st>2013-01-27 12:52:06 +0100
commit76d436f51501bd47ff463b88a196f517191f58ad (patch)
tree1f22ba2385ad22eca306d67793c0827451f2b50a /cores/arduino/new.cpp
parentbb9cc4f70c17eed497ab30d7bfe6eebb35055205 (diff)
parentc6287dd6ac33544179a6544b8f3f55a396ec6608 (diff)
Merge branch 'ide-1.5.x' into can
Diffstat (limited to 'cores/arduino/new.cpp')
-rw-r--r--cores/arduino/new.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/cores/arduino/new.cpp b/cores/arduino/new.cpp
index 0f6d422..b81031e 100644
--- a/cores/arduino/new.cpp
+++ b/cores/arduino/new.cpp
@@ -5,10 +5,20 @@ void * operator new(size_t size)
return malloc(size);
}
+void * operator new[](size_t size)
+{
+ return malloc(size);
+}
+
void operator delete(void * ptr)
{
free(ptr);
-}
+}
+
+void operator delete[](void * ptr)
+{
+ free(ptr);
+}
int __cxa_guard_acquire(__guard *g) {return !*(char *)(g);};
void __cxa_guard_release (__guard *g) {*(char *)g = 1;};