aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/new.cpp
diff options
context:
space:
mode:
authorAlexander Entinger <consulting@lxrobotics.com>2019-09-16 10:21:51 +0200
committerGitHub <noreply@github.com>2019-09-16 10:21:51 +0200
commit366b1b814702ec0da8951f9e13af882352442940 (patch)
tree597ffcfd6407f4b7c55639ee54f5b517c25c9e79 /cores/arduino/new.cpp
parent0c5aa78ff40d208a1341b3dae84166e837901070 (diff)
parent742abcd9660d4b754fede51f098113fca918cb54 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'cores/arduino/new.cpp')
-rw-r--r--cores/arduino/new.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/cores/arduino/new.cpp b/cores/arduino/new.cpp
index cf6f89c..fc30cf8 100644
--- a/cores/arduino/new.cpp
+++ b/cores/arduino/new.cpp
@@ -26,6 +26,11 @@ void *operator new[](size_t size) {
return malloc(size);
}
+void * operator new(size_t size, void * ptr) noexcept {
+ (void)size;
+ return ptr;
+}
+
void operator delete(void * ptr) {
free(ptr);
}