Merge branch 'master' of ../Arduino-Helpers

Author: tttapa

src/AH/PrintStream/PrintStream.cpp

@@ -5,7 +5,7 @@
 // LCOV_EXCL_START
 
 #if not defined(ARDUINO_ARCH_ESP32) && not defined(ARDUINO_ARCH_SAM) &&        \
-    not defined(ARDUINO_API_VERSION)
+    not defined(ARDUINO_API_VERSION) && not defined(ArduinoFake)
 #define FLUSH
 #endif
 

src/AH/STL/Fallback/new

@@ -39,6 +39,8 @@
 #include "bits/c++config.h"
 // #include <exception>
 
+#include <new.h> // Arduino's version of the <new> header
+
 #pragma GCC visibility push(default)
 
 extern "C++" {
@@ -86,6 +88,7 @@ namespace std
   enum class align_val_t: size_t {};
 #endif
 
+#if !defined(NEW_H) || defined(__AVR_ATmega4809__) // already defined in Arduino's version of <new>
   struct nothrow_t
   {
 #if __cplusplus >= 201103L
@@ -107,9 +110,11 @@ namespace std
   /// Return the current new handler.
   new_handler get_new_handler() noexcept;
 #endif
+#endif // NEW_H
 } // namespace std
 
 //@{
+#if !defined(NEW_H) || defined(__AVR_ATmega4809__) // already defined in Arduino's version of <new>
 /** These are replaceable signatures:
  *  - normal single new and delete (no arguments, throw @c bad_alloc on error)
  *  - normal array new and delete (same)
@@ -120,6 +125,7 @@ namespace std
  *  Placement new and delete signatures (take a memory address argument,
  *  does nothing) may not be replaced by a user's program.
 */
+#ifndef __AVR_ATmega4809__
 void* operator new(std::size_t) _GLIBCXX_THROW (std::bad_alloc)
   __attribute__((__externally_visible__));
 void* operator new[](std::size_t) _GLIBCXX_THROW (std::bad_alloc)
@@ -128,6 +134,7 @@ void operator delete(void*) _GLIBCXX_USE_NOEXCEPT
   __attribute__((__externally_visible__));
 void operator delete[](void*) _GLIBCXX_USE_NOEXCEPT
   __attribute__((__externally_visible__));
+#endif
 #if __cpp_sized_deallocation
 void operator delete(void*, std::size_t) _GLIBCXX_USE_NOEXCEPT
   __attribute__((__externally_visible__));
@@ -176,6 +183,7 @@ inline void* operator new[](std::size_t, void* __p) _GLIBCXX_USE_NOEXCEPT
 // Default placement versions of operator delete.
 inline void operator delete  (void*, void*) _GLIBCXX_USE_NOEXCEPT { }
 inline void operator delete[](void*, void*) _GLIBCXX_USE_NOEXCEPT { }
+#endif // NEW_H
 //@}
 } // extern "C++"