mike-matera · matthijskooijman · Jan 10, 2022 · Jan 10, 2022
diff --git a/src/ArduinoSTL.cpp b/src/ArduinoSTL.cpp
@@ -1,4 +1,4 @@
-#include "ArduinoSTL.h"
+#include <ArduinoSTL.h>
 #include <Arduino.h>
 
 //

diff --git a/src/ArduinoSTL.h b/src/ArduinoSTL.h
@@ -10,7 +10,7 @@
 #define ARDUINOSTL_M_H
 
 #include <Arduino.h>
-#include "serstream"
+#include <serstream>
 
 // Create cout and cin.. there doesn't seem to be a way
 // to control what serial device at runtime. Grr.

diff --git a/src/abi/abi.cpp b/src/abi/abi.cpp
@@ -17,9 +17,9 @@
 	USA.
 */
 
-#include "cstdlib"
-#include "typeinfo"
-#include "basic_definitions"
+#include <cstdlib>
+#include <typeinfo>
+#include <basic_definitions>
 
 /* This file implements a number of the language support features
  * needed to deal with the C++ abi, as originally documented in the

diff --git a/src/algorithm b/src/algorithm
@@ -15,10 +15,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "cstdlib"
-#include "iterator"
-#include "utility"
-#include "functional"
+#include <cstdlib>
+#include <iterator>
+#include <utility>
+#include <functional>
 
 #ifndef __STD_HEADER_ALGORITHM
 #define __STD_HEADER_ALGORITHM 1

diff --git a/src/algorithm.cpp b/src/algorithm.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include "algorithm"
+#include <algorithm>
 
 
 namespace std{

diff --git a/src/array b/src/array
@@ -1,8 +1,8 @@
 #ifndef __ARRAY__
 #define __ARRAY__
 
-#include "cstddef"
-#include "initializer_list"
+#include <cstddef>
+#include <initializer_list>
 
 namespace std {
 

diff --git a/src/associative_base b/src/associative_base
@@ -18,11 +18,11 @@
 
 
 
-#include "memory"
-#include "utility"
-#include "iterator"
-#include "functional"
-#include "list"
+#include<memory>
+#include<utility>
+#include<iterator>
+#include<functional>
+#include<list>
 
 
 #ifndef __STD_HEADER_ASSOCIATIVE_BASE

diff --git a/src/associative_base.cpp b/src/associative_base.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include "associative_base"
+#include <associative_base>
 
 namespace std{
 

diff --git a/src/basic_definitions b/src/basic_definitions
@@ -18,7 +18,7 @@
 #ifndef __BASIC_DEFINITIONS
 #define __BASIC_DEFINITIONS 1
 
-#include "system_configuration.h"
+#include <system_configuration.h>
 
 #pragma GCC visibility push(default)
 

diff --git a/src/bitset b/src/bitset
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "basic_definitions"
-#include "cstddef"
-#include "climits"
-#include "func_exception"
-#include "string"
-#include "iosfwd"
+#include <basic_definitions>
+#include <cstddef>
+#include <climits>
+#include <func_exception>
+#include <string>
+#include <iosfwd>
 
 #ifndef __STD_BITSET_HEADER
 #define __STD_BITSET_HEADER 1

diff --git a/src/bitset.cpp b/src/bitset.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include "bitset"
+#include <bitset>
 
 namespace std{
 

diff --git a/src/char_traits b/src/char_traits
@@ -16,14 +16,14 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "basic_definitions"
+#include <basic_definitions>
 #include <string.h>
-#include "exception"
-#include "memory"
+#include <exception>
+#include <memory>
 
 #ifdef __UCLIBCXX_HAS_WCHAR__
-#include "cwchar"
-#include "cwctype"
+#include <cwchar>
+#include <cwctype>
 #endif
 
 #ifndef __HEADER_CHAR_TRAITS

diff --git a/src/char_traits.cpp b/src/char_traits.cpp
@@ -21,8 +21,8 @@
 #define __UCLIBCXX_COMPILE_CHAR_TRAITS__ 1
 
 
-#include "basic_definitions"
-#include "char_traits"
+#include <basic_definitions>
+#include <char_traits>
 
 namespace std{
 

diff --git a/src/complex b/src/complex
@@ -17,8 +17,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "istream"
-#include "ostream"
+#include <istream>
+#include <ostream>
 
 #ifndef __STD_HEADER_COMPLEX
 #define __STD_HEADER_COMPLEX 1

diff --git a/src/complex.cpp b/src/complex.cpp
@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "complex"
+#include <complex>
 
 
 namespace std{

diff --git a/src/cstdio b/src/cstdio
@@ -16,7 +16,7 @@
 */
 
 #include <stdio.h>
-#include "basic_definitions"
+#include <basic_definitions>
 
 #ifndef __HEADER_CSTDIO
 #define __HEADER_CSTDIO 1

diff --git a/src/cstdlib b/src/cstdlib
@@ -17,7 +17,7 @@
 */
 
 #include <stdlib.h>
-#include "basic_definitions"
+#include <basic_definitions>
 
 #ifndef __HEADER_CSTDLIB
 #define __HEADER_CSTDLIB 1

diff --git a/src/cstring b/src/cstring
@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "cstddef"
+#include <cstddef>
 #include <string.h>
 
 #ifndef __HEADER_CSTRING

diff --git a/src/ctime b/src/ctime
@@ -46,7 +46,7 @@
 
 #pragma GCC system_header
 
-#include "cstddef"
+#include <cstddef>
 
 #include <time.h>
 

diff --git a/src/cwchar b/src/cwchar
@@ -16,7 +16,7 @@
 */
 
 #include <wchar.h>
-#include "basic_definitions"
+#include <basic_definitions>
 
 #ifndef __HEADER_CWCHAR
 #define __HEADER_CWCHAR 1

diff --git a/src/del_op.cpp b/src/del_op.cpp
@@ -17,15 +17,12 @@
 	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>
 
+#if defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100
 _UCXXEXPORT void operator delete(void* ptr) _UCXX_USE_NOEXCEPT{
 	free(ptr);
 }
-
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100
diff --git a/src/del_opnt.cpp b/src/del_opnt.cpp
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "new"
-#include "cstdlib"
-#include "func_exception"
+#include <new>
+#include <cstdlib>
+#include <func_exception>
 
-#ifndef NO_NOTHROW
+#if defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)
 _UCXXEXPORT void operator delete(void* ptr, const std::nothrow_t& ) _UCXX_USE_NOEXCEPT {
 	free(ptr);
 }
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)
diff --git a/src/del_ops.cpp b/src/del_ops.cpp
@@ -18,10 +18,12 @@
 */
 /* C++14 sized deallocation */
 
-#include "new"
-#include "cstdlib"
-#include "func_exception"
+#include <new>
+#include <cstdlib>
+#include <func_exception>
 
+#if defined(USING_NEW_FROM_UCLIBC)
 _UCXXEXPORT void operator delete(void* ptr, std::size_t) _UCXX_USE_NOEXCEPT{
 	::operator delete (ptr);
 }
+#endif // defined(USING_NEW_FROM_UCLIBC)
diff --git a/src/del_opv.cpp b/src/del_opv.cpp
@@ -17,15 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-// Arduino 1.0 contains an implementation for this.
-#if ARDUINO < 100
-
+#if defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100
 #include <new>
 #include <cstdlib>
 #include <func_exception>
 
 _UCXXEXPORT void operator delete[](void * ptr) _UCXX_USE_NOEXCEPT{
 	free(ptr);
 }
-
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100
diff --git a/src/del_opvnt.cpp b/src/del_opvnt.cpp
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "new"
-#include "cstdlib"
-#include "func_exception"
+#include <new>
+#include <cstdlib>
+#include <func_exception>
 
-#ifndef NO_NOTHROW
+#if defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)
 _UCXXEXPORT void operator delete[](void* ptr, const std::nothrow_t& ) _UCXX_USE_NOEXCEPT{
 	free(ptr);
 }
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)
diff --git a/src/del_opvs.cpp b/src/del_opvs.cpp
@@ -18,10 +18,12 @@
 */
 /* C++14 sized deallocation */
 
-#include "new"
-#include "cstdlib"
-#include "func_exception"
+#include <new>
+#include <cstdlib>
+#include <func_exception>
 
+#if defined(USING_NEW_FROM_UCLIBC)
 _UCXXEXPORT void operator delete[](void * ptr, std::size_t) _UCXX_USE_NOEXCEPT{
 	::operator delete[] (ptr);
 }
+#endif // defined(USING_NEW_FROM_UCLIBC)
diff --git a/src/deque b/src/deque
@@ -17,9 +17,9 @@
 */
 
 
-#include "memory"
-#include "iterator"
-#include "stdexcept"
+#include <memory>
+#include <iterator>
+#include <stdexcept>
 
 #pragma GCC visibility push(default)
 

diff --git a/src/deque.cpp b/src/deque.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include "deque"
+#include <deque>
 
 
 namespace std{

diff --git a/src/eh_alloc.cpp b/src/eh_alloc.cpp
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "cstdlib"
-#include "cstring"
-#include "func_exception"
+#include <cstdlib>
+#include <cstring>
+#include <func_exception>
 
 //This is a system-specific header which does all of the error-handling management
-#include "unwind-cxx.h"
+#include <unwind-cxx.h>
 
 namespace __cxxabiv1
 {

diff --git a/src/eh_globals.cpp b/src/eh_globals.cpp
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "cstdlib"
-#include "cstring"
-#include "func_exception"
+#include <cstdlib>
+#include <cstring>
+#include <func_exception>
 
 //This is a system-specific header which does all of the error-handling management
-#include "unwind-cxx.h"
+#include <unwind-cxx.h>
 
 //The following functionality is derived from reading of the GNU libstdc++ code and making it...simple
 

diff --git a/src/exception b/src/exception
@@ -37,7 +37,7 @@
 #ifndef __EXCEPTION__
 #define __EXCEPTION__
 
-#include "basic_definitions"
+#include <basic_definitions>
 
 extern "C++" {
 

diff --git a/src/exception.cpp b/src/exception.cpp
@@ -18,7 +18,7 @@
 
 */
 
-#include "exception"
+#include <exception>
 
 //We can't do this yet because gcc is too stupid to be able to handle
 //different implementations of exception class.