Skip to content

Commit de69fec

Browse files
ye-luoye-luo
authoredNov 20, 2024
Revert "[Multi] make changes to rely on ADL get instead of std::get"
1 parent 73672a7 commit de69fec

File tree

255 files changed

+18613
-25309
lines changed

Some content is hidden

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

255 files changed

+18613
-25309
lines changed
 

‎external_codes/boost_multi/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
command to update subtree to v0.80.1 tag. Run from top level QMCPACK source directory
22

3-
git subtree pull --squash -P external_codes/boost_multi/multi https://gitlab.com/correaa/boost-multi.git v0.86.0
3+
git subtree pull --squash -P external_codes/boost_multi/multi https://gitlab.com/correaa/boost-multi.git v0.80.1

‎external_codes/boost_multi/multi/.clang-format

+216-50
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,230 @@
1-
# https://clang-format-configurator.site
2-
# Copyright 2020-2024 Alfredo A. Correa
31
---
4-
Language: Cpp
5-
AccessModifierOffset: -3
6-
AlignAfterOpenBracket: BlockIndent
2+
Language: Cpp
3+
# BasedOnStyle: Google
4+
#AccessModifierOffset: -1
5+
AlignAfterOpenBracket: BlockIndent # Align
76
AlignArrayOfStructures: Right
8-
AlignConsecutiveAssignments:
9-
Enabled: true
10-
AcrossEmptyLines: false
11-
AcrossComments: false
12-
AlignConsecutiveDeclarations:
13-
Enabled: true
14-
AcrossEmptyLines: false
15-
AcrossComments: false
16-
AlignOperands: AlignAfterOperator
17-
AllowAllArgumentsOnNextLine: false
18-
AllowShortLambdasOnASingleLine: Inline
19-
AllowShortCaseLabelsOnASingleLine: true
20-
AlwaysBreakTemplateDeclarations: No
7+
#AlignConsecutiveMacros: None
8+
AlignConsecutiveAssignments: Consecutive # None
9+
#AlignConsecutiveBitFields: None
10+
AlignConsecutiveDeclarations: Consecutive
11+
#AlignEscapedNewlines: Left
12+
AlignOperands: AlignAfterOperator
13+
AlignTrailingComments: false
14+
#AllowAllArgumentsOnNextLine: true
15+
#AllowAllParametersOfDeclarationOnNextLine: true
16+
#AllowShortEnumsOnASingleLine: true
17+
#AllowShortBlocksOnASingleLine: Never
18+
AllowShortCaseLabelsOnASingleLine: true # false
19+
#AllowShortFunctionsOnASingleLine: All
20+
#AllowShortLambdasOnASingleLine: All
21+
#AllowShortIfStatementsOnASingleLine: WithoutElse
22+
#AllowShortLoopsOnASingleLine: true
23+
#AlwaysBreakAfterDefinitionReturnType: None
24+
#AlwaysBreakAfterReturnType: None
25+
#AlwaysBreakBeforeMultilineStrings: true
26+
AlwaysBreakTemplateDeclarations: No # Yes
27+
#AttributeMacros:
28+
# - __capability
29+
#BinPackArguments: true
30+
#BinPackParameters: true
31+
#BraceWrapping:
32+
# AfterCaseLabel: false
33+
# AfterClass: false
34+
# AfterControlStatement: Never
35+
# AfterEnum: false
36+
# AfterFunction: false
37+
# AfterNamespace: false
38+
# AfterObjCDeclaration: false
39+
# AfterStruct: false
40+
# AfterUnion: false
41+
# AfterExternBlock: false
42+
# BeforeCatch: false
43+
# BeforeElse: false
44+
# BeforeLambdaBody: false
45+
# BeforeWhile: false
46+
# IndentBraces: false
47+
# SplitEmptyFunction: true
48+
# SplitEmptyRecord: true
49+
# SplitEmptyNamespace: true
50+
#BreakBeforeBinaryOperators: None
51+
#BreakBeforeConceptDeclarations: true
52+
#BreakBeforeBraces: Attach
53+
#BreakBeforeInheritanceComma: false
2154
BreakInheritanceList: BeforeComma
22-
BraceWrapping:
23-
BeforeLambdaBody: false
24-
ColumnLimit: 0
25-
QualifierAlignment: Right
55+
#BreakBeforeTernaryOperators: true
56+
#BreakConstructorInitializersBeforeComma: false
57+
#BreakConstructorInitializers: BeforeColon
58+
#BreakAfterJavaFieldAnnotations: false
59+
#BreakStringLiterals: true
60+
ColumnLimit: 0
61+
#CommentPragmas: '^ IWYU pragma:'
62+
QualifierAlignment: Right # Leave
63+
#CompactNamespaces: false
2664
ConstructorInitializerIndentWidth: 0
27-
ContinuationIndentWidth: 4
28-
Cpp11BracedListStyle: true
65+
ContinuationIndentWidth: 99
66+
#Cpp11BracedListStyle: true
67+
#DeriveLineEnding: true
68+
#DerivePointerAlignment: true
69+
#DisableFormat: false
70+
#EmptyLineAfterAccessModifier: Never
71+
#EmptyLineBeforeAccessModifier: LogicalBlock
72+
#ExperimentalAutoDetectBinPacking: false
73+
#PackConstructorInitializers: NextLine
74+
#BasedOnStyle: ''
75+
#ConstructorInitializerAllOnOneLineOrOnePerLine: false
76+
#AllowAllConstructorInitializersOnNextLine: true
2977
FixNamespaceComments: true
30-
IncludeBlocks: Regroup
31-
IncludeCategories:
32-
- Regex: <boost/test/unit_test\.hpp>
33-
Priority: 1
34-
- Regex: <(boost\/multi)\/
35-
Priority: 2
36-
- Regex: <([A-Za-z0-9\Q/-_\E])+>
37-
Priority: 6
38-
- Regex: <(catch2|boost)\/
39-
Priority: 5
40-
- Regex: <([A-Za-z0-9.\Q/-_\E])+>
41-
Priority: 4
42-
- Regex: '"([A-Za-z0-9.\Q/-_\E])+"'
43-
Priority: 3
44-
IndentPPDirectives: BeforeHash
45-
IndentWidth: 4
46-
# LambdaBodyIndentation: Signature
78+
#ForEachMacros:
79+
# - foreach
80+
# - Q_FOREACH
81+
# - BOOST_FOREACH
82+
#IfMacros:
83+
# - KJ_IF_MAYBE
84+
#IncludeBlocks: Regroup
85+
#IncludeCategories:
86+
# - Regex: '^<ext/.*\.h>'
87+
# Priority: 2
88+
# SortPriority: 0
89+
# CaseSensitive: false
90+
# - Regex: '^<.*\.h>'
91+
# Priority: 1
92+
# SortPriority: 0
93+
# CaseSensitive: false
94+
# - Regex: '^<.*'
95+
# Priority: 2
96+
# SortPriority: 0
97+
# CaseSensitive: false
98+
# - Regex: '.*'
99+
# Priority: 3
100+
# SortPriority: 0
101+
# CaseSensitive: false
102+
#IncludeIsMainRegex: '([-_](test|unittest))?$'
103+
#IncludeIsMainSourceRegex: ''
104+
#IndentAccessModifiers: true # false
105+
AccessModifierOffset: -98 # 2
106+
#IndentCaseLabels: true
107+
#IndentCaseBlocks: false
108+
#IndentGotoLabels: true
109+
#IndentPPDirectives: None
110+
#IndentExternBlock: AfterExternBlock
111+
#IndentRequires: false
112+
IndentWidth: 99
113+
#IndentWrappedFunctionNames: false
114+
#InsertTrailingCommas: None
115+
#JavaScriptQuotes: Leave
116+
#JavaScriptWrapImports: true
117+
#KeepEmptyLinesAtTheStartOfBlocks: false
118+
#LambdaBodyIndentation: Signature
119+
#MacroBlockBegin: ''
120+
#MacroBlockEnd: ''
121+
#MaxEmptyLinesToKeep: 1
122+
#NamespaceIndentation: None
123+
#ObjCBinPackProtocolList: Never
124+
#ObjCBlockIndentWidth: 2
125+
#ObjCBreakBeforeNestedBlockParam: true
126+
#ObjCSpaceAfterProperty: false
127+
#ObjCSpaceBeforeProtocolList: true
128+
#PenaltyBreakAssignment: 2
129+
#PenaltyBreakBeforeFirstCallParameter: 1
130+
#PenaltyBreakComment: 300
131+
#PenaltyBreakFirstLessLess: 120
132+
#PenaltyBreakOpenParenthesis: 0
133+
#PenaltyBreakString: 1000
47134
PenaltyBreakTemplateDeclaration: 10
135+
#PenaltyExcessCharacter: 1000000
136+
#PenaltyReturnTypeOnItsOwnLine: 200
137+
#PenaltyIndentedWhitespace: 0
48138
PointerAlignment: Left
49-
SpaceAfterTemplateKeyword: false
50-
SpaceBeforeAssignmentOperators: true
51-
SpaceBeforeParens: Custom
139+
#PPIndentWidth: -1
140+
#RawStringFormats:
141+
# - Language: Cpp
142+
# Delimiters:
143+
# - cc
144+
# - CC
145+
# - cpp
146+
# - Cpp
147+
# - CPP
148+
# - 'c++'
149+
# - 'C++'
150+
# CanonicalDelimiter: ''
151+
# BasedOnStyle: google
152+
# - Language: TextProto
153+
# Delimiters:
154+
# - pb
155+
# - PB
156+
# - proto
157+
# - PROTO
158+
# EnclosingFunctions:
159+
# - EqualsProto
160+
# - EquivToProto
161+
# - PARSE_PARTIAL_TEXT_PROTO
162+
# - PARSE_TEST_PROTO
163+
# - PARSE_TEXT_PROTO
164+
# - ParseTextOrDie
165+
# - ParseTextProtoOrDie
166+
# - ParseTestProto
167+
# - ParsePartialTestProto
168+
# CanonicalDelimiter: pb
169+
# BasedOnStyle: google
170+
#ReferenceAlignment: Pointer
171+
#ReflowComments: true
172+
#RemoveBracesLLVM: false
173+
#SeparateDefinitionBlocks: Leave
174+
#ShortNamespaceLines: 1
175+
#SortIncludes: CaseSensitive
176+
#SortJavaStaticImport: Before
177+
#SortUsingDeclarations: true
178+
#SpaceAfterCStyleCast: false
179+
#SpaceAfterLogicalNot: false
180+
SpaceAfterTemplateKeyword: false # true
181+
#SpaceBeforeAssignmentOperators: true
182+
#SpaceBeforeCaseColon: false
183+
#SpaceBeforeCpp11BracedList: false
184+
#SpaceBeforeCtorInitializerColon: true
185+
#SpaceBeforeInheritanceColon: true
186+
SpaceBeforeParens: Custom # ControlStatements
52187
SpaceBeforeParensOptions:
53-
AfterControlStatements: false
188+
AfterControlStatements: false # true
189+
# AfterForeachMacros: true
190+
# AfterFunctionDefinitionName: false
191+
# AfterFunctionDeclarationName: false
192+
# AfterIfMacros: true
193+
# AfterOverloadedOperator: false
194+
# BeforeNonEmptyParentheses: false
195+
#SpaceAroundPointerQualifiers: Default
196+
#SpaceBeforeRangeBasedForLoopColon: true
197+
#SpaceInEmptyBlock: false
198+
#SpaceInEmptyParentheses: false
54199
SpacesBeforeTrailingComments: 2
200+
#SpacesInAngles: Never
201+
#SpacesInConditionalStatement: false
202+
#SpacesInContainerLiterals: true
203+
#SpacesInCStyleCastParentheses: false
55204
SpacesInLineCommentPrefix:
56-
Minimum: 1
57-
Standard: c++17
58-
TabWidth: 4
59-
UseTab: ForContinuationAndIndentation
205+
Minimum: 1
206+
# Maximum: -1
207+
#SpacesInParentheses: false
208+
#SpacesInSquareBrackets: false
209+
#SpaceBeforeSquareBrackets: false
210+
#BitFieldColonSpacing: Both
211+
Standard: c++17
212+
#StatementAttributeLikeMacros:
213+
# - Q_EMIT
214+
#StatementMacros:
215+
# - Q_UNUSED
216+
# - QT_REQUIRE_VERSION
217+
TabWidth: 99
218+
#UseCRLF: false
219+
UseTab: ForContinuationAndIndentation # Never
60220
WhitespaceSensitiveMacros:
61221
- BOOST_REQUIRE
62222
- BOOST_TEST
63223
- BOOST_TEST_REQUIRE
64-
- BOOST_AUTO_TEST_CASE
224+
#WhitespaceSensitiveMacros:
225+
# - STRINGIZE
226+
# - PP_STRINGIZE
227+
# - BOOST_PP_STRINGIZE
228+
# - NS_SWIFT_NAME
229+
# - CF_SWIFT_NAME
230+
...

0 commit comments

Comments
 (0)
Please sign in to comment.