From fa9fa42fb9ec5ca974769e450bdf2e3f5d15085d Mon Sep 17 00:00:00 2001
From: Evgeny Kochetkov <evgeny.kochetkov@me.com>
Date: Mon, 17 Sep 2018 13:04:28 +0300
Subject: [PATCH] refactor(xod-arduino, xod-tabtest): define "new" operator
 only for AVR architecture

---
 packages/xod-arduino/platform/memory.h                       | 2 +-
 packages/xod-tabtest/cpp/Arduino.h                           | 2 --
 workspace/blink/__fixtures__/arduino.cpp                     | 2 +-
 workspace/count-with-feedback-loops/__fixtures__/arduino.cpp | 2 +-
 workspace/lcd-time/__fixtures__/arduino.cpp                  | 2 +-
 workspace/two-button-switch/__fixtures__/arduino.cpp         | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/xod-arduino/platform/memory.h b/packages/xod-arduino/platform/memory.h
index 8f97657f..96e0d2df 100644
--- a/packages/xod-arduino/platform/memory.h
+++ b/packages/xod-arduino/platform/memory.h
@@ -5,7 +5,7 @@
  *
  *
  =============================================================================*/
-#ifndef XOD_NO_PLACEMENT_NEW
+#ifdef __AVR__
 // Placement `new` for Arduino
 void* operator new(size_t, void* ptr) {
     return ptr;
diff --git a/packages/xod-tabtest/cpp/Arduino.h b/packages/xod-tabtest/cpp/Arduino.h
index b7582864..b3e08b16 100644
--- a/packages/xod-tabtest/cpp/Arduino.h
+++ b/packages/xod-tabtest/cpp/Arduino.h
@@ -2,8 +2,6 @@
 #ifndef ARDUINO_H
 #define ARDUINO_H
 
-#define XOD_NO_PLACEMENT_NEW
-
 #include <stddef.h> // for size_t
 #include <stdint.h> // for uint32_t, etc
 #include <string.h> // for strlen
diff --git a/workspace/blink/__fixtures__/arduino.cpp b/workspace/blink/__fixtures__/arduino.cpp
index 72041993..f74d4064 100644
--- a/workspace/blink/__fixtures__/arduino.cpp
+++ b/workspace/blink/__fixtures__/arduino.cpp
@@ -390,7 +390,7 @@ class XStringCString : public XString {
  *
  *
  =============================================================================*/
-#ifndef XOD_NO_PLACEMENT_NEW
+#ifdef __AVR__
 // Placement `new` for Arduino
 void* operator new(size_t, void* ptr) {
     return ptr;
diff --git a/workspace/count-with-feedback-loops/__fixtures__/arduino.cpp b/workspace/count-with-feedback-loops/__fixtures__/arduino.cpp
index 31f47c98..7595d95b 100644
--- a/workspace/count-with-feedback-loops/__fixtures__/arduino.cpp
+++ b/workspace/count-with-feedback-loops/__fixtures__/arduino.cpp
@@ -390,7 +390,7 @@ class XStringCString : public XString {
  *
  *
  =============================================================================*/
-#ifndef XOD_NO_PLACEMENT_NEW
+#ifdef __AVR__
 // Placement `new` for Arduino
 void* operator new(size_t, void* ptr) {
     return ptr;
diff --git a/workspace/lcd-time/__fixtures__/arduino.cpp b/workspace/lcd-time/__fixtures__/arduino.cpp
index b153a45e..ef38d140 100644
--- a/workspace/lcd-time/__fixtures__/arduino.cpp
+++ b/workspace/lcd-time/__fixtures__/arduino.cpp
@@ -390,7 +390,7 @@ class XStringCString : public XString {
  *
  *
  =============================================================================*/
-#ifndef XOD_NO_PLACEMENT_NEW
+#ifdef __AVR__
 // Placement `new` for Arduino
 void* operator new(size_t, void* ptr) {
     return ptr;
diff --git a/workspace/two-button-switch/__fixtures__/arduino.cpp b/workspace/two-button-switch/__fixtures__/arduino.cpp
index 1e7c674d..5402b3b2 100644
--- a/workspace/two-button-switch/__fixtures__/arduino.cpp
+++ b/workspace/two-button-switch/__fixtures__/arduino.cpp
@@ -390,7 +390,7 @@ class XStringCString : public XString {
  *
  *
  =============================================================================*/
-#ifndef XOD_NO_PLACEMENT_NEW
+#ifdef __AVR__
 // Placement `new` for Arduino
 void* operator new(size_t, void* ptr) {
     return ptr;