coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-15 08:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some conflicts

Browse Source
This commit is contained in:
John Wellbelove 2026-05-31 10:30:46 +01:00
parent 0ea66204e3
commit 64aeb2bdd7
18 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -419,3 +419,4 @@ hugo/resources
hugo/.hugo_build.lock hugo/.hugo_build.lock
docs/*.html docs/*.html
test/build-coverage test/build-coverage
test/vs2022/Build

1
include/etl/profiles/arduino_arm.h
View File

@ -43,6 +43,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 1 #define ETL_NO_NULLPTR_SUPPORT 1
#define ETL_NO_LARGE_CHAR_SUPPORT 1 #define ETL_NO_LARGE_CHAR_SUPPORT 1
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#endif #endif

1
include/etl/profiles/armv5.h
View File

@ -43,6 +43,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT (__cplusplus < 201103L) #define ETL_NO_NULLPTR_SUPPORT (__cplusplus < 201103L)
#define ETL_NO_LARGE_CHAR_SUPPORT (__cplusplus < 201103L) #define ETL_NO_LARGE_CHAR_SUPPORT (__cplusplus < 201103L)
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#endif #endif

1
include/etl/profiles/armv5_no_stl.h
View File

@ -43,7 +43,6 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT (__cplusplus < 201103L) #define ETL_NO_NULLPTR_SUPPORT (__cplusplus < 201103L)
#define ETL_NO_LARGE_CHAR_SUPPORT (__cplusplus < 201103L) #define ETL_NO_LARGE_CHAR_SUPPORT (__cplusplus < 201103L)
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#define ETL_NO_STL #define ETL_NO_STL
#endif #endif

1
include/etl/profiles/armv6.h
View File

@ -43,6 +43,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
#endif #endif

1
include/etl/profiles/armv6_no_stl.h
View File

@ -43,7 +43,6 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
#define ETL_NO_STL #define ETL_NO_STL
#endif #endif

1
include/etl/profiles/armv7.h
View File

@ -43,6 +43,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
#endif #endif

1
include/etl/profiles/armv7_no_stl.h
View File

@ -43,7 +43,6 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
#define ETL_NO_STL #define ETL_NO_STL
#endif #endif

1
include/etl/profiles/cpp03.h
View File

@ -43,6 +43,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 1 #define ETL_NO_NULLPTR_SUPPORT 1
#define ETL_NO_LARGE_CHAR_SUPPORT 1 #define ETL_NO_LARGE_CHAR_SUPPORT 1
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#endif #endif

1
include/etl/profiles/cpp03_no_stl.h
View File

@ -43,7 +43,6 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 1 #define ETL_NO_NULLPTR_SUPPORT 1
#define ETL_NO_LARGE_CHAR_SUPPORT 1 #define ETL_NO_LARGE_CHAR_SUPPORT 1
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#define ETL_NO_STL #define ETL_NO_STL
#endif #endif

1
include/etl/profiles/cpp11.h
View File

@ -43,6 +43,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
#endif #endif

1
include/etl/profiles/cpp11_no_stl.h
View File

@ -43,7 +43,6 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#define ETL_NO_STL #define ETL_NO_STL
#endif #endif

1
include/etl/profiles/cpp14.h
View File

@ -43,6 +43,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
#endif #endif

1
include/etl/profiles/cpp14_no_stl.h
View File

@ -43,7 +43,6 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#define ETL_NO_STL #define ETL_NO_STL
#endif #endif

1
include/etl/profiles/cpp17.h
View File

@ -43,6 +43,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 1 #define ETL_CPP17_SUPPORTED 1
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
#endif #endif

1
include/etl/profiles/cpp17_no_stl.h
View File

@ -43,7 +43,6 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 1 #define ETL_CPP17_SUPPORTED 1
#define ETL_NO_NULLPTR_SUPPORT 0 #define ETL_NO_NULLPTR_SUPPORT 0
#define ETL_NO_LARGE_CHAR_SUPPORT 0 #define ETL_NO_LARGE_CHAR_SUPPORT 0
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#define ETL_NO_STL #define ETL_NO_STL
#endif #endif

1
include/etl/profiles/ticc.h
View File

@ -42,6 +42,5 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 1 #define ETL_NO_NULLPTR_SUPPORT 1
#define ETL_NO_LARGE_CHAR_SUPPORT 1 #define ETL_NO_LARGE_CHAR_SUPPORT 1
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#endif #endif

1
include/etl/profiles/ticc_no_stl.h
View File

@ -42,7 +42,6 @@ SOFTWARE.
#define ETL_CPP17_SUPPORTED 0 #define ETL_CPP17_SUPPORTED 0
#define ETL_NO_NULLPTR_SUPPORT 1 #define ETL_NO_NULLPTR_SUPPORT 1
#define ETL_NO_LARGE_CHAR_SUPPORT 1 #define ETL_NO_LARGE_CHAR_SUPPORT 1
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
#define ETL_NO_STL #define ETL_NO_STL
#endif #endif