Skip to content

Commit 6c514ac

Browse files
authored
Merge pull request #173 from Geode-solutions/fix/absl2026
fix(OpenGeode): update abseil
2 parents 26f60f7 + fbad11e commit 6c514ac

3 files changed

Lines changed: 33 additions & 27 deletions

File tree

.clang-format

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@ AlwaysBreakTemplateDeclarations: true
2121
BinPackArguments: true
2222
BinPackParameters: false
2323
BraceWrapping:
24-
AfterClass: true
25-
AfterControlStatement: true
26-
AfterEnum: true
27-
AfterFunction: true
28-
AfterNamespace: true
29-
AfterObjCDeclaration: true
30-
AfterStruct: true
31-
AfterUnion: true
32-
BeforeCatch: true
33-
BeforeElse: true
34-
IndentBraces: false
24+
AfterClass: true
25+
AfterControlStatement: true
26+
AfterEnum: true
27+
AfterFunction: true
28+
AfterNamespace: true
29+
AfterObjCDeclaration: true
30+
AfterStruct: true
31+
AfterUnion: true
32+
BeforeCatch: true
33+
BeforeElse: true
34+
IndentBraces: false
3535
BreakBeforeBinaryOperators: NonAssignment
3636
BreakBeforeBraces: Custom
3737
BreakBeforeTernaryOperators: true
3838
BreakConstructorInitializers: BeforeColon
3939
BreakInheritanceList: BeforeColon
4040
#BreakStringLiterals
4141
ColumnLimit: 80
42-
CommentPragmas: ''
42+
CommentPragmas: ""
4343
CompactNamespaces: false
4444
ConstructorInitializerAllOnOneLineOrOnePerLine: true
4545
ConstructorInitializerIndentWidth: 4

.clang-tidy

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,37 @@
55
Checks: >
66
*,
77
-altera*,
8+
-boost*,
89
-fuchsia*,
910
-llvmlibc*,
1011
-llvm-header-guard,
12+
-llvm-prefer-static-over-anonymous-namespace,
13+
-google-readability-todo,
1114
-misc-no-recursion,
15+
-misc-include-cleaner,
16+
-misc-const-correctness,
1217
-modernize-use-trailing-return-type,
18+
-portability-avoid-pragma-once,
19+
-readability-use-anyofallof,
1320
-readability-redundant-access-specifiers,
1421
-readability-convert-member-functions-to-static,
15-
-cppcoreguidelines-avoid-const-or-ref-data-members
22+
-cppcoreguidelines-avoid-const-or-ref-data-members,
23+
-cppcoreguidelines-pro-bounds-constant-array-index
1624
1725
CheckOptions:
18-
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
19-
value: '1'
26+
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
27+
value: "1"
2028
- key: readability-identifier-length.MinimumLoopCounterNameLength
2129
value: 1
2230
- key: readability-identifier-length.IgnoredVariableNames
23-
value: '^[defijkptuvw]$'
31+
value: "^[_defijkptuvwxyz]$"
2432
# More options here: https://clang.llvm.org/extra/clang-tidy/checks/readability/identifier-naming.html
2533
- key: readability-identifier-naming.NamespaceCase
2634
value: lower_case
2735
- key: readability-identifier-naming.ClassCase
28-
value: CamelCase
36+
value: CamelCase
2937
- key: readability-identifier-naming.StructCase
30-
value: CamelCase
38+
value: CamelCase
3139
- key: readability-identifier-naming.FunctionCase
3240
value: lower_case
3341
- key: readability-identifier-naming.VariableCase
@@ -51,14 +59,14 @@ CheckOptions:
5159
- key: readability-identifier-naming.GlobalFunctionCase
5260
value: lower_case
5361
- key: readability-identifier-naming.MemberConstantCase
54-
value: CamelCase
62+
value: CamelCase
5563
- key: readability-identifier-naming.StaticConstantCase
56-
value: lower_case
64+
value: lower_case
5765
- key: readability-function-cognitive-complexity.Threshold
5866
value: 10
67+
- key: readability-function-cognitive-complexity.IgnoreMacros
68+
value: true
5969
- key: readability-function-size.ParameterThreshold
6070
value: 4
61-
- key: misc-include-cleaner.IgnoreHeaders
62-
value: utility;cstddef;geode/.*_export\.h;geode/.*/common\.h;geode/basic/types\.h;geode/basic/assert\.h;
63-
64-
71+
- key: cppcoreguidelines-pro-type-member-init.IgnoreArrays
72+
value: true

src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ namespace geode
107107
}
108108
const auto polyhedra_around = mesh_.polyhedra_around_edge(
109109
polyhedron_edge_vertices, polyhedron_id );
110-
if( !polyhedra_around_edge_are_the_same(
111-
mesh_.polyhedra_around_edge(
112-
polyhedron_edge_vertices, polyhedron_id ),
110+
if( !polyhedra_around_edge_are_the_same( polyhedra_around,
113111
polyhedra_around_edges_.at( polyhedron_edge ) ) )
114112
{
115113
return false;

0 commit comments

Comments
 (0)