Guard new and delete operators to prevent “multiple definition” compi…

…lation errors
mike-matera · Jan 10, 2017 · 80d70de · 80d70de
1 parent f58e668
commit 80d70de
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/src/del_op.cpp b/src/del_op.cpp
@@ -17,10 +17,15 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+// Arduino 1.0 contains an implementation for this.
+#if ARDUINO < 100
+
 #include <new>
 #include <cstdlib>
 #include <func_exception>
 
 _UCXXEXPORT void operator delete(void* ptr) throw(){
 	free(ptr);
 }
+
+#endif
diff --git a/src/del_opv.cpp b/src/del_opv.cpp
@@ -17,10 +17,15 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+// Arduino 1.0 contains an implementation for this.
+#if ARDUINO < 100
+
 #include <new>
 #include <cstdlib>
 #include <func_exception>
 
 _UCXXEXPORT void operator delete[](void * ptr) throw(){
 	free(ptr);
 }
+
+#endif
diff --git a/src/new_op.cpp b/src/new_op.cpp
@@ -17,6 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+// Arduino 1.0 contains an implementation for this.
+#if ARDUINO < 100
+
 #include <new>
 #include <cstdlib>
 #include <func_exception>
@@ -33,3 +36,5 @@ _UCXXEXPORT void* operator new(std::size_t numBytes) throw(std::bad_alloc){
 	}
 	return p;
 }
+
+#endif
diff --git a/src/new_opv.cpp b/src/new_opv.cpp
@@ -17,6 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+// Arduino 1.0 contains an implementation for this.
+#if ARDUINO < 100
+
 #include <new>
 #include <cstdlib>
 #include <func_exception>
@@ -33,3 +36,5 @@ _UCXXEXPORT void* operator new[](std::size_t numBytes) throw(std::bad_alloc){
 	}
 	return p;
 }
+
+#endif