Skip to content

Commit 9cf4766

Browse files
Fix differences in clang-format vs CI/CD
1 parent c89043c commit 9cf4766

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

cpp/common/test/Linkage/test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class C1 { // inherits external linkage from enclosing namespace
3434
int m1;
3535
static int m2; // inherits external linkage from class scope
3636
void m3() {} // inherits external linkage from class scope
37-
}; // inherits external linkage from class scope
37+
}; // inherits external linkage from class scope
3838

3939
typedef class {
4040
int m1;
@@ -107,7 +107,7 @@ class C1 { // inherits internal linkage from enclosing namespace
107107
int m1;
108108
static int m2; // inherits internal linkage from class scope
109109
void m3() {} // inherits internal linkage from class scope
110-
}; // inherits internal linkage from class scope
110+
}; // inherits internal linkage from class scope
111111

112112
typedef struct {
113113
int m1;
@@ -131,7 +131,7 @@ typedef class { // inherits internal linkage from enclosing namespace
131131
int m1;
132132
// static int m2 not allowed in anonymous class
133133
void m3() {} // inherits internal linkage from class scope
134-
}; // inherits internal linkage from class scope
134+
}; // inherits internal linkage from class scope
135135

136136
typedef class { // inherits internal linkage from enclosing namespace
137137
int m1;

cpp/misra/test/rules/RULE-0-2-1/test.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ int test_simple() {
1010
}
1111

1212
int test_maybe_unused() {
13-
[[maybe_unused]]
14-
int l0; // COMPLIANT - has attr unused
13+
[[maybe_unused]] int l0; // COMPLIANT - has attr unused
1514
}
1615

1716
int test_const() {
@@ -86,7 +85,7 @@ template <bool... Args> extern constexpr bool all_of_v = true; // COMPLIANT
8685

8786
template <bool B1, bool... Args>
8887
extern constexpr bool all_of_v<B1, Args...> =
89-
B1 && all_of_v<Args...>; // COMPLIANT
88+
B1 &&all_of_v<Args...>; // COMPLIANT
9089

9190
void test_template_variable() { all_of_v<true, true, true>; }
9291

0 commit comments

Comments
 (0)