Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit 44b34b3

Browse files
matthijskooijmanmatthijskooijman
committed
Revert "change include directives to use double quotes"
This does not seem to be a complete and proper fix for the conflict between uclibc++ new/delete and the ones defined by the AVR core, since it only fixes conflicts in the header files, but source files might still produce linker errors. So better revert it and stay closer to upstream uclibc++ sources. This reverts commit 84b4a91.
1 parent b0f7e7d commit 44b34b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+247
-247
lines changed

‎src/Arduino_AVRSTL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "Arduino_AVRSTL.h"
1+
#include <Arduino_AVRSTL.h>
22
#include <Arduino.h>
33

44
//

‎src/Arduino_AVRSTL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define ARDUINOSTL_M_H
1111

1212
#include <Arduino.h>
13-
#include "serstream"
13+
#include <serstream>
1414

1515
// Create cout and cin.. there doesn't seem to be a way
1616
// to control what serial device at runtime. Grr.

‎src/abi/abi.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
USA.
1818
*/
1919

20-
#include "cstdlib"
21-
#include "typeinfo"
22-
#include "basic_definitions"
20+
#include <cstdlib>
21+
#include <typeinfo>
22+
#include <basic_definitions>
2323

2424
/* This file implements a number of the language support features
2525
* needed to deal with the C++ abi, as originally documented in the

‎src/algorithm

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1616
*/
1717

18-
#include "cstdlib"
19-
#include "iterator"
20-
#include "utility"
21-
#include "functional"
18+
#include <cstdlib>
19+
#include <iterator>
20+
#include <utility>
21+
#include <functional>
2222

2323
#ifndef __STD_HEADER_ALGORITHM
2424
#define __STD_HEADER_ALGORITHM 1

‎src/algorithm.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020

21-
#include "algorithm"
21+
#include <algorithm>
2222

2323

2424
namespace std{

‎src/array

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef __ARRAY__
22
#define __ARRAY__
33

4-
#include "cstddef"
5-
#include "initializer_list"
4+
#include <cstddef>
5+
#include <initializer_list>
66

77
namespace std {
88

‎src/associative_base

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919

2020

21-
#include "memory"
22-
#include "utility"
23-
#include "iterator"
24-
#include "functional"
25-
#include "list"
21+
#include<memory>
22+
#include<utility>
23+
#include<iterator>
24+
#include<functional>
25+
#include<list>
2626

2727

2828
#ifndef __STD_HEADER_ASSOCIATIVE_BASE

‎src/associative_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
1818
*/
1919

20-
#include "associative_base"
20+
#include <associative_base>
2121

2222
namespace std{
2323

‎src/basic_definitions

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef __BASIC_DEFINITIONS
1919
#define __BASIC_DEFINITIONS 1
2020

21-
#include "system_configuration.h"
21+
#include <system_configuration.h>
2222

2323
#pragma GCC visibility push(default)
2424

‎src/bitset

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "basic_definitions"
21-
#include "cstddef"
22-
#include "climits"
23-
#include "func_exception"
24-
#include "string"
25-
#include "iosfwd"
20+
#include <basic_definitions>
21+
#include <cstddef>
22+
#include <climits>
23+
#include <func_exception>
24+
#include <string>
25+
#include <iosfwd>
2626

2727
#ifndef __STD_BITSET_HEADER
2828
#define __STD_BITSET_HEADER 1

‎src/bitset.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
1818
*/
1919

20-
#include "bitset"
20+
#include <bitset>
2121

2222
namespace std{
2323

‎src/char_traits

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1717
*/
1818

19-
#include "basic_definitions"
19+
#include <basic_definitions>
2020
#include <string.h>
21-
#include "exception"
22-
#include "memory"
21+
#include <exception>
22+
#include <memory>
2323

2424
#ifdef __UCLIBCXX_HAS_WCHAR__
25-
#include "cwchar"
26-
#include "cwctype"
25+
#include <cwchar>
26+
#include <cwctype>
2727
#endif
2828

2929
#ifndef __HEADER_CHAR_TRAITS

‎src/char_traits.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#define __UCLIBCXX_COMPILE_CHAR_TRAITS__ 1
2222

2323

24-
#include "basic_definitions"
25-
#include "char_traits"
24+
#include <basic_definitions>
25+
#include <char_traits>
2626

2727
namespace std{
2828

‎src/complex

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "istream"
21-
#include "ostream"
20+
#include <istream>
21+
#include <ostream>
2222

2323
#ifndef __STD_HEADER_COMPLEX
2424
#define __STD_HEADER_COMPLEX 1

‎src/complex.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1717
*/
1818

19-
#include "complex"
19+
#include <complex>
2020

2121

2222
namespace std{

‎src/cstdio

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#include <stdio.h>
19-
#include "basic_definitions"
19+
#include <basic_definitions>
2020

2121
#ifndef __HEADER_CSTDIO
2222
#define __HEADER_CSTDIO 1

‎src/cstdlib

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
#include <stdlib.h>
20-
#include "basic_definitions"
20+
#include <basic_definitions>
2121

2222
#ifndef __HEADER_CSTDLIB
2323
#define __HEADER_CSTDLIB 1

‎src/cstring

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1717
*/
1818

19-
#include "cstddef"
19+
#include <cstddef>
2020
#include <string.h>
2121

2222
#ifndef __HEADER_CSTRING

‎src/ctime

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
#pragma GCC system_header
4848

49-
#include "cstddef"
49+
#include <cstddef>
5050

5151
#include <time.h>
5252

‎src/cwchar

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#include <wchar.h>
19-
#include "basic_definitions"
19+
#include <basic_definitions>
2020

2121
#ifndef __HEADER_CWCHAR
2222
#define __HEADER_CWCHAR 1

‎src/del_opnt.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "new"
21-
#include "cstdlib"
22-
#include "func_exception"
20+
#include <new>
21+
#include <cstdlib>
22+
#include <func_exception>
2323

2424
#ifndef NO_NOTHROW
2525
_UCXXEXPORT void operator delete(void* ptr, const std::nothrow_t& ) throw() {

‎src/del_ops.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
/* C++14 sized deallocation */
2020

21-
#include "new"
22-
#include "cstdlib"
23-
#include "func_exception"
21+
#include <new>
22+
#include <cstdlib>
23+
#include <func_exception>
2424

2525
_UCXXEXPORT void operator delete(void* ptr, std::size_t) throw(){
2626
::operator delete (ptr);

‎src/del_opvnt.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "new"
21-
#include "cstdlib"
22-
#include "func_exception"
20+
#include <new>
21+
#include <cstdlib>
22+
#include <func_exception>
2323

2424
#ifndef NO_NOTHROW
2525
_UCXXEXPORT void operator delete[](void* ptr, const std::nothrow_t& ) throw(){

‎src/del_opvs.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
/* C++14 sized deallocation */
2020

21-
#include "new"
22-
#include "cstdlib"
23-
#include "func_exception"
21+
#include <new>
22+
#include <cstdlib>
23+
#include <func_exception>
2424

2525
_UCXXEXPORT void operator delete[](void * ptr, std::size_t) throw(){
2626
::operator delete[] (ptr);

‎src/deque

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
*/
1818

1919

20-
#include "memory"
21-
#include "iterator"
22-
#include "stdexcept"
20+
#include <memory>
21+
#include <iterator>
22+
#include <stdexcept>
2323

2424
#pragma GCC visibility push(default)
2525

‎src/deque.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
1818
*/
1919

20-
#include "deque"
20+
#include <deque>
2121

2222

2323
namespace std{

‎src/eh_alloc.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "cstdlib"
21-
#include "cstring"
22-
#include "func_exception"
20+
#include <cstdlib>
21+
#include <cstring>
22+
#include <func_exception>
2323

2424
//This is a system-specific header which does all of the error-handling management
25-
#include "unwind-cxx.h"
25+
#include <unwind-cxx.h>
2626

2727
namespace __cxxabiv1
2828
{

‎src/eh_globals.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "cstdlib"
21-
#include "cstring"
22-
#include "func_exception"
20+
#include <cstdlib>
21+
#include <cstring>
22+
#include <func_exception>
2323

2424
//This is a system-specific header which does all of the error-handling management
25-
#include "unwind-cxx.h"
25+
#include <unwind-cxx.h>
2626

2727
//The following functionality is derived from reading of the GNU libstdc++ code and making it...simple
2828

‎src/exception

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#ifndef __EXCEPTION__
3838
#define __EXCEPTION__
3939

40-
#include "basic_definitions"
40+
#include <basic_definitions>
4141

4242
extern "C++" {
4343

‎src/exception.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
1919
*/
2020

21-
#include "exception"
21+
#include <exception>
2222

2323
//We can't do this yet because gcc is too stupid to be able to handle
2424
//different implementations of exception class.

‎src/func_exception

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "basic_definitions"
21-
#include "exception"
20+
#include <basic_definitions>
21+
#include <exception>
2222

2323

2424
#ifndef HEADER_IMPLEMENTATION_FUNC_EXCEPTION

‎src/func_exception.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "exception"
21-
#include "func_exception"
22-
#include "stdexcept"
23-
#include "cstdlib"
20+
#include <exception>
21+
#include <func_exception>
22+
#include <stdexcept>
23+
#include <cstdlib>
2424

2525
namespace std{
2626

‎src/functional

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef __STD_HEADER_FUNCTIONAL
2020
#define __STD_HEADER_FUNCTIONAL 1
2121

22-
#include "basic_definitions"
22+
#include <basic_definitions>
2323

2424
#pragma GCC visibility push(default)
2525

‎src/iomanip

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1818
*/
1919

20-
#include "exception"
21-
#include "ios"
20+
#include <exception>
21+
#include <ios>
2222

2323
#ifndef __STD_IOMANIP
2424
#define __STD_IOMANIP 1

0 commit comments

Comments
 (0)