Skip to content

Commit 54b83b2

Browse files
committed
Updated readme to reflect output
1 parent 9724f0e commit 54b83b2

File tree

3 files changed

+152
-171
lines changed

3 files changed

+152
-171
lines changed

.clang-format

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
BasedOnStyle: LLVM
22
AccessModifierOffset: -2
3-
AlignAfterOpenBracket: true
4-
AlignEscapedNewlinesLeft: false
5-
AlignOperands: true
3+
AlignAfterOpenBracket: "true"
4+
AlignEscapedNewlines: Left
5+
AlignOperands: "true"
66
AlignTrailingComments: true
77
AllowAllParametersOfDeclarationOnNextLine: true
8-
AllowShortBlocksOnASingleLine: true
8+
AllowShortBlocksOnASingleLine: Always
99
AllowShortCaseLabelsOnASingleLine: false
1010
AllowShortFunctionsOnASingleLine: Empty
11-
AllowShortIfStatementsOnASingleLine: false
11+
AllowShortIfStatementsOnASingleLine: "false"
1212
AllowShortLoopsOnASingleLine: false
13-
AlwaysBreakAfterDefinitionReturnType: false
13+
AlwaysBreakAfterDefinitionReturnType: None
1414
AlwaysBreakBeforeMultilineStrings: true
15-
AlwaysBreakTemplateDeclarations: true
15+
AlwaysBreakTemplateDeclarations: Yes
1616
SpaceAfterTemplateKeyword: false
1717
BinPackArguments: true
1818
BinPackParameters: true
19-
BreakBeforeBinaryOperators: None
2019
BreakBeforeBraces: Attach
2120
BreakBeforeTernaryOperators: true
22-
BreakConstructorInitializersBeforeComma: true
23-
ColumnLimit: 80
21+
ColumnLimit: 100
2422
CommentPragmas: '^ IWYU pragma:'
2523
ConstructorInitializerAllOnOneLineOrOnePerLine: false
2624
ConstructorInitializerIndentWidth: 2
@@ -30,6 +28,7 @@ DerivePointerAlignment: false
3028
DisableFormat: false
3129
ExperimentalAutoDetectBinPacking: false
3230
IndentCaseLabels: false
31+
IndentRequires: true
3332
IndentWidth: 2
3433
IndentWrappedFunctionNames: false
3534
KeepEmptyLinesAtTheStartOfBlocks: true
@@ -41,7 +40,7 @@ ObjCSpaceAfterProperty: false
4140
ObjCSpaceBeforeProtocolList: true
4241
PenaltyBreakBeforeFirstCallParameter: 19
4342
PenaltyBreakComment: 300
44-
PenaltyBreakFirstLessLess: 80
43+
PenaltyBreakFirstLessLess: 100
4544
PenaltyBreakString: 1000
4645
PenaltyExcessCharacter: 1000000
4746
PenaltyReturnTypeOnItsOwnLine: 60
@@ -56,7 +55,13 @@ SpacesInCStyleCastParentheses: false
5655
SpacesInContainerLiterals: true
5756
SpacesInParentheses: true
5857
SpacesInSquareBrackets: false
59-
Standard: Cpp11
58+
Standard: c++17
6059
TabWidth: 2
6160
UseTab: ForIndentation
62-
61+
BreakConstructorInitializersBeforeComma: true
62+
AllowAllConstructorInitializersOnNextLine: true
63+
BreakInheritanceList: AfterColon
64+
AllowAllParametersOfDeclarationOnNextLine: false
65+
BinPackParameters: false
66+
BinPackArguments: false
67+
AllowAllArgumentsOnNextLine: false

.gitignore

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Thumbs.db
33
#Ignore files build by Visual Studio
44
*.obj
5+
*.swp
56
*.exe
67
*.pdb
78
*.user
@@ -31,8 +32,6 @@ _ReSharper*/
3132
## Ignore Visual Studio temporary files, build results, and
3233
## files generated by popular Visual Studio add-ons.
3334
# User-specific files
34-
*.suo
35-
*.user
3635
*.userosscache
3736
*.sln.docstates
3837
# User-specific folders
@@ -60,25 +59,14 @@ TestResult.xml
6059
[Dd]ebugPS/
6160
[Rr]eleasePS/
6261
dlldata.c
63-
*_i.c
64-
*_p.c
6562
*_i.h
66-
*.ilk
6763
*.meta
68-
*.obj
69-
*.pch
70-
*.pdb
7164
*.pgc
7265
*.pgd
7366
*.rsp
74-
*.sbr
75-
*.tlb
7667
*.tli
77-
*.tlh
7868
*.tmp
7969
*.tmp_proj
80-
*.log
81-
*.vspscc
8270
*.vssscc
8371
.builds
8472
*.pidb
@@ -88,9 +76,6 @@ dlldata.c
8876
_Chutzpah*
8977
# Visual C++ cache files
9078
ipch/
91-
*.aps
92-
*.ncb
93-
*.opensdf
9479
*.sdf
9580
*.cachefile
9681
# Visual Studio profiler
@@ -102,7 +87,6 @@ $tf/
10287
# Guidance Automation Toolkit
10388
*.gpState
10489
# ReSharper is a .NET coding add-in
105-
_ReSharper*/
10690
*.[Rr]e[Ss]harper
10791
*.DotSettings.user
10892
# JustCode is a .NET coding addin-in
@@ -135,7 +119,7 @@ publish/
135119
# Publish Web Output
136120
*.[Pp]ublish.xml
137121
*.azurePubxml
138-
# TODO: Comment the next line if you want to checkin your web deploy settings
122+
# TODO: Comment the next line if you want to checkin your web deploy settings
139123
# but database connection strings (with potential passwords) will be unencrypted
140124
*.pubxml
141125
*.publishproj
@@ -183,12 +167,13 @@ UpgradeLog*.htm
183167
*.bim_*.settings
184168
# Microsoft Fakes
185169
FakesAssemblies/
186-
*.suo
187170
*.vcxproj.filters
188171
*.npp
189172
CMakeFiles/*
190173
nbproject/*
191174
*.cd
192-
*.cd
193175
a.out
194176
cmake-build-*/*
177+
CMakeSettings.json
178+
.vs/
179+
**/.DS_Store

0 commit comments

Comments
 (0)