Skip to content

Commit 5c5abfd

Browse files
marzermarzer
committed
Merge branch 'v3'
2 parents 20d3c13 + d33da0c commit 5c5abfd

File tree

177 files changed

+32418
-22614
lines changed

Some content is hidden

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

177 files changed

+32418
-22614
lines changed

‎.circleci/config.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44

55
debug_clang:
66
docker:
7-
- image: marzer/cpp_dev:0.1.0
7+
- image: marzer/cpp_dev:0.2.0
88
resource_class: large
99
steps:
1010
- checkout
@@ -23,12 +23,13 @@ jobs:
2323
- run:
2424
name: Building and testing with clang
2525
command: |
26-
CXX_LD=lld CXX=clang++ meson build --buildtype=debug -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false
26+
update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-13 130
27+
CXX_LD=lld CXX=clang++ meson build --buildtype=debug -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false -Dasan_examples=true
2728
cd build && meson compile -j 4 && meson test --num-processes 1 --verbose
2829
2930
release_clang:
3031
docker:
31-
- image: marzer/cpp_dev:0.1.0
32+
- image: marzer/cpp_dev:0.2.0
3233
resource_class: large
3334
steps:
3435
- checkout
@@ -39,12 +40,13 @@ jobs:
3940
- run:
4041
name: Building and testing with clang
4142
command: |
42-
CXX_LD=lld CXX=clang++ meson build --buildtype=release -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false
43+
update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-13 130
44+
CXX_LD=lld CXX=clang++ meson build --buildtype=release -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false -Dasan_examples=true
4345
cd build && meson compile -j 4 && meson test --num-processes 1 --verbose
4446
4547
debug_gcc:
4648
docker:
47-
- image: marzer/cpp_dev:0.1.0
49+
- image: marzer/cpp_dev:0.2.0
4850
resource_class: large
4951
steps:
5052
- checkout
@@ -55,12 +57,13 @@ jobs:
5557
- run:
5658
name: Building and testing with gcc
5759
command: |
60+
update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-13 130
5861
CXX_LD=lld CXX=g++ meson build --buildtype=debug -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false
5962
cd build && meson compile -j 4 && meson test --num-processes 1 --verbose
6063
6164
release_gcc:
6265
docker:
63-
- image: marzer/cpp_dev:0.1.0
66+
- image: marzer/cpp_dev:0.2.0
6467
resource_class: large
6568
steps:
6669
- checkout
@@ -71,12 +74,13 @@ jobs:
7174
- run:
7275
name: Building and testing with gcc
7376
command: |
77+
update-alternatives --install /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-13 130
7478
CXX_LD=lld CXX=g++ meson build --buildtype=release -Dpedantic=true -Dbuild_tests=true -Dbuild_examples=true -Dgenerate_cmake_config=false -Db_lto=false
7579
cd build && meson compile -j 4 && meson test --num-processes 1 --verbose
7680
7781
generate_dox:
7882
docker:
79-
- image: marzer/cpp_dev:0.1.0
83+
- image: marzer/cpp_dev:0.2.0
8084
resource_class: small
8185
steps:
8286
- checkout

‎.clang-format‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,15 @@ AlwaysBreakBeforeMultilineStrings: false
2525
AlwaysBreakTemplateDeclarations: Yes
2626
AttributeMacros:
2727
- TOML_ABSTRACT_BASE
28+
- TOML_CLOSED_ENUM
29+
- TOML_CLOSED_FLAGS_ENUM
2830
- TOML_EMPTY_BASES
31+
- TOML_FLAGS_ENUM
32+
- TOML_LIKELY_CASE
33+
- TOML_OPEN_ENUM
34+
- TOML_OPEN_FLAGS_ENUM
2935
- TOML_TRIVIAL_ABI
36+
- TOML_UNLIKELY_CASE
3037
BinPackArguments: false
3138
BinPackParameters: false
3239
BraceWrapping:
@@ -96,7 +103,7 @@ IncludeIsMainSourceRegex: ''
96103
IndentCaseLabels: true
97104
IndentCaseBlocks: false
98105
IndentGotoLabels: true
99-
IndentPPDirectives: BeforeHash
106+
IndentPPDirectives: None
100107
IndentExternBlock: Indent
101108
IndentRequires: false
102109
IndentWidth: 4
@@ -124,6 +131,7 @@ PenaltyExcessCharacter: 1000000
124131
PenaltyReturnTypeOnItsOwnLine: 1000000
125132
PenaltyIndentedWhitespace: 0
126133
PointerAlignment: Left
134+
ReferenceAlignment: Left
127135
ReflowComments: true
128136
SortIncludes: false
129137
SortJavaStaticImport: Before
@@ -155,13 +163,17 @@ StatementMacros:
155163
- TOML_ALWAYS_INLINE
156164
- TOML_API
157165
- TOML_ATTR
158-
- TOML_CONSTEVAL
166+
- TOML_CONST_GETTER
167+
- TOML_CONST_INLINE_GETTER
168+
- TOML_EXTERN
159169
- TOML_EXTERNAL_LINKAGE
160170
- TOML_INTERNAL_LINKAGE
161171
- TOML_MEMBER_ATTR
162172
- TOML_NEVER_INLINE
163173
- TOML_NODISCARD
164174
- TOML_NODISCARD_CTOR
175+
- TOML_PURE_GETTER
176+
- TOML_PURE_INLINE_GETTER
165177
- TOML_RETURNS_BY_THROWING
166178
TabWidth: 4
167179
TypenameMacros:

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
* text=auto encoding=UTF-8
22

3+
*.bat text eol=lf encoding=UTF-8
34
*.c text eol=lf encoding=UTF-8
45
*.cpp text eol=lf encoding=UTF-8
56
*.css text eol=lf encoding=UTF-8

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
[submodule "external/tloptional"]
1414
path = external/tloptional
1515
url = https://github.com/TartanLlama/optional.git
16+
[submodule "external/json"]
17+
path = external/json
18+
url = https://github.com/nlohmann/json.git

0 commit comments

Comments
 (0)