Skip to content

Commit 2a63cae

Browse files
committed
Remove no-longer necessary semi-colons
1 parent bb72625 commit 2a63cae

19 files changed

+317
-317
lines changed

tests/runtime_tests_lifetime.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <vector>
77

88
TEMPLATE_LIST_TEST_CASE("observer expiring scope", "[lifetime][owner][observer]", owner_types) {
9-
memory_tracker mem_track;
9+
volatile memory_tracker mem_track;
1010

1111
{
1212
observer_ptr<TestType> optr;
@@ -25,11 +25,11 @@ TEMPLATE_LIST_TEST_CASE("observer expiring scope", "[lifetime][owner][observer]"
2525
}
2626

2727
CHECK_NO_LEAKS;
28-
};
28+
}
2929

3030
TEMPLATE_LIST_TEST_CASE(
3131
"observer not expiring when owner moved", "[lifetime][owner][observer]", owner_types) {
32-
memory_tracker mem_track;
32+
volatile memory_tracker mem_track;
3333

3434
{
3535
TestType outer_ptr;
@@ -59,10 +59,10 @@ TEMPLATE_LIST_TEST_CASE(
5959
}
6060

6161
CHECK_NO_LEAKS;
62-
};
62+
}
6363

6464
TEMPLATE_LIST_TEST_CASE("observer expiring reset", "[lifetime][owner][observer]", owner_types) {
65-
memory_tracker mem_track;
65+
volatile memory_tracker mem_track;
6666

6767
{
6868
observer_ptr<TestType> optr;
@@ -82,12 +82,12 @@ TEMPLATE_LIST_TEST_CASE("observer expiring reset", "[lifetime][owner][observer]"
8282
}
8383

8484
CHECK_NO_LEAKS;
85-
};
85+
}
8686

8787
TEMPLATE_LIST_TEST_CASE(
8888
"release valid owner with observer", "[lifetime][release][owner][observer]", owner_types) {
8989
if constexpr (!is_sealed<TestType>) {
90-
memory_tracker mem_track;
90+
volatile memory_tracker mem_track;
9191

9292
{
9393
observer_ptr<TestType> optr;
@@ -126,14 +126,14 @@ TEMPLATE_LIST_TEST_CASE(
126126

127127
CHECK_NO_LEAKS;
128128
}
129-
};
129+
}
130130

131131
TEMPLATE_LIST_TEST_CASE(
132132
"release valid owner with observer subobject",
133133
"[lifetime][release][owner][observer]",
134134
owner_types) {
135135
if constexpr (!is_sealed<TestType>) {
136-
memory_tracker mem_track;
136+
volatile memory_tracker mem_track;
137137

138138
{
139139
state_observer_ptr<TestType> optr;
@@ -170,11 +170,11 @@ TEMPLATE_LIST_TEST_CASE(
170170

171171
CHECK_NO_LEAKS;
172172
}
173-
};
173+
}
174174

175175
TEMPLATE_LIST_TEST_CASE(
176176
"observer get and raw get", "[lifetime][get][raw_get][owner][observer]", owner_types) {
177-
memory_tracker mem_track;
177+
volatile memory_tracker mem_track;
178178

179179
{
180180
observer_ptr<TestType> optr;
@@ -196,14 +196,14 @@ TEMPLATE_LIST_TEST_CASE(
196196
}
197197

198198
CHECK_NO_LEAKS;
199-
};
199+
}
200200

201201
TEMPLATE_LIST_TEST_CASE(
202202
"object owning observer pointer to itself",
203203
"[lifetime][cycles][owner][observer]",
204204
owner_types) {
205205
if constexpr (is_cyclic<TestType>) {
206-
memory_tracker mem_track;
206+
volatile memory_tracker mem_track;
207207

208208
{
209209
TestType ptr = make_pointer_deleter_1<TestType>();
@@ -214,12 +214,12 @@ TEMPLATE_LIST_TEST_CASE(
214214

215215
CHECK_NO_LEAKS;
216216
}
217-
};
217+
}
218218

219219
TEMPLATE_LIST_TEST_CASE(
220220
"object owning observer pointer to other", "[lifetime][cycles][owner][observer]", owner_types) {
221221
if constexpr (is_cyclic<TestType>) {
222-
memory_tracker mem_track;
222+
volatile memory_tracker mem_track;
223223

224224
{
225225
TestType ptr1 = make_pointer_deleter_1<TestType>();
@@ -232,14 +232,14 @@ TEMPLATE_LIST_TEST_CASE(
232232

233233
CHECK_NO_LEAKS;
234234
}
235-
};
235+
}
236236

237237
TEMPLATE_LIST_TEST_CASE(
238238
"object owning observer pointer open chain",
239239
"[lifetime][cycles][owner][observer]",
240240
owner_types) {
241241
if constexpr (is_cyclic<TestType>) {
242-
memory_tracker mem_track;
242+
volatile memory_tracker mem_track;
243243

244244
{
245245
TestType ptr1 = make_pointer_deleter_1<TestType>();
@@ -253,14 +253,14 @@ TEMPLATE_LIST_TEST_CASE(
253253

254254
CHECK_NO_LEAKS;
255255
}
256-
};
256+
}
257257

258258
TEMPLATE_LIST_TEST_CASE(
259259
"object owning observer pointer open chain reversed",
260260
"[lifetime][cycles][owner][observer]",
261261
owner_types) {
262262
if constexpr (is_cyclic<TestType>) {
263-
memory_tracker mem_track;
263+
volatile memory_tracker mem_track;
264264

265265
{
266266
TestType ptr1 = make_pointer_deleter_1<TestType>();
@@ -274,14 +274,14 @@ TEMPLATE_LIST_TEST_CASE(
274274

275275
CHECK_NO_LEAKS;
276276
}
277-
};
277+
}
278278

279279
TEMPLATE_LIST_TEST_CASE(
280280
"object owning observer pointer closed chain interleaved",
281281
"[lifetime][cycles][owner][observer]",
282282
owner_types) {
283283
if constexpr (is_cyclic<TestType>) {
284-
memory_tracker mem_track;
284+
volatile memory_tracker mem_track;
285285

286286
{
287287
TestType ptr1 = make_pointer_deleter_1<TestType>();
@@ -298,10 +298,10 @@ TEMPLATE_LIST_TEST_CASE(
298298

299299
CHECK_NO_LEAKS;
300300
}
301-
};
301+
}
302302

303303
TEMPLATE_LIST_TEST_CASE("pointers in vector", "[lifetime][array][owner][observer]", owner_types) {
304-
memory_tracker mem_track;
304+
volatile memory_tracker mem_track;
305305

306306
{
307307
std::vector<TestType> vec_own;
@@ -346,4 +346,4 @@ TEMPLATE_LIST_TEST_CASE("pointers in vector", "[lifetime][array][owner][observer
346346
}
347347

348348
CHECK_NO_LEAKS;
349-
};
349+
}

tests/runtime_tests_make_observable.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ TEMPLATE_LIST_TEST_CASE("make observable", "[make_observable][owner]", owner_typ
2424

2525
CHECK_NO_LEAKS;
2626
}
27-
};
27+
}
2828

2929
TEMPLATE_LIST_TEST_CASE("make observable with arguments", "[make_observable][owner]", owner_types) {
3030
if constexpr (can_use_make_observable<TestType>) {
@@ -49,7 +49,7 @@ TEMPLATE_LIST_TEST_CASE("make observable with arguments", "[make_observable][own
4949

5050
CHECK_NO_LEAKS;
5151
}
52-
};
52+
}
5353

5454
TEMPLATE_LIST_TEST_CASE(
5555
"make observable throw in constructor", "[make_observable][owner]", owner_types) {
@@ -63,7 +63,7 @@ TEMPLATE_LIST_TEST_CASE(
6363

6464
CHECK_NO_LEAKS;
6565
}
66-
};
66+
}
6767

6868
TEMPLATE_LIST_TEST_CASE("make observable bad alloc", "[make_observable][owner]", owner_types) {
6969
if constexpr (can_use_make_observable<TestType>) {
@@ -75,7 +75,7 @@ TEMPLATE_LIST_TEST_CASE("make observable bad alloc", "[make_observable][owner]",
7575

7676
CHECK_NO_LEAKS;
7777
}
78-
};
78+
}
7979

8080
TEST_CASE("make observable unique", "[make_observable][owner]") {
8181
using TestType = oup::observable_unique_ptr<test_object>;
@@ -91,7 +91,7 @@ TEST_CASE("make observable unique", "[make_observable][owner]") {
9191
}
9292

9393
CHECK_NO_LEAKS;
94-
};
94+
}
9595

9696
TEST_CASE("make observable sealed", "[make_observable][owner]") {
9797
using TestType = oup::observable_sealed_ptr<test_object>;
@@ -107,4 +107,4 @@ TEST_CASE("make observable sealed", "[make_observable][owner]") {
107107
}
108108

109109
CHECK_NO_LEAKS;
110-
};
110+
}

tests/runtime_tests_observer_assignment_copy.cpp

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

55
TEMPLATE_LIST_TEST_CASE(
66
"observer copy assignment operator valid to empty", "[assignment][observer]", owner_types) {
7-
memory_tracker mem_track;
7+
volatile memory_tracker mem_track;
88

99
{
1010
TestType ptr_orig = make_pointer_deleter_1<TestType>();
@@ -24,11 +24,11 @@ TEMPLATE_LIST_TEST_CASE(
2424
}
2525

2626
CHECK_NO_LEAKS;
27-
};
27+
}
2828

2929
TEMPLATE_LIST_TEST_CASE(
3030
"observer copy assignment operator empty to valid", "[assignment][observer]", owner_types) {
31-
memory_tracker mem_track;
31+
volatile memory_tracker mem_track;
3232

3333
{
3434
observer_ptr<TestType> optr_orig;
@@ -48,11 +48,11 @@ TEMPLATE_LIST_TEST_CASE(
4848
}
4949

5050
CHECK_NO_LEAKS;
51-
};
51+
}
5252

5353
TEMPLATE_LIST_TEST_CASE(
5454
"observer copy assignment operator empty to empty", "[assignment][observer]", owner_types) {
55-
memory_tracker mem_track;
55+
volatile memory_tracker mem_track;
5656

5757
{
5858
observer_ptr<TestType> optr_orig;
@@ -71,11 +71,11 @@ TEMPLATE_LIST_TEST_CASE(
7171
}
7272

7373
CHECK_NO_LEAKS;
74-
};
74+
}
7575

7676
TEMPLATE_LIST_TEST_CASE(
7777
"observer copy assignment operator valid to valid", "[assignment][observer]", owner_types) {
78-
memory_tracker mem_track;
78+
volatile memory_tracker mem_track;
7979

8080
{
8181
TestType ptr_orig = make_pointer_deleter_1<TestType>();
@@ -96,13 +96,13 @@ TEMPLATE_LIST_TEST_CASE(
9696
}
9797

9898
CHECK_NO_LEAKS;
99-
};
99+
}
100100

101101
TEMPLATE_LIST_TEST_CASE(
102102
"observer copy assignment converting operator valid to empty",
103103
"[assignment][observer]",
104104
owner_types) {
105-
memory_tracker mem_track;
105+
volatile memory_tracker mem_track;
106106

107107
if constexpr (has_base<TestType>) {
108108
{
@@ -124,13 +124,13 @@ TEMPLATE_LIST_TEST_CASE(
124124

125125
CHECK_NO_LEAKS;
126126
}
127-
};
127+
}
128128

129129
TEMPLATE_LIST_TEST_CASE(
130130
"observer copy assignment converting operator empty to valid",
131131
"[assignment][observer]",
132132
owner_types) {
133-
memory_tracker mem_track;
133+
volatile memory_tracker mem_track;
134134

135135
if constexpr (has_base<TestType>) {
136136
{
@@ -152,13 +152,13 @@ TEMPLATE_LIST_TEST_CASE(
152152

153153
CHECK_NO_LEAKS;
154154
}
155-
};
155+
}
156156

157157
TEMPLATE_LIST_TEST_CASE(
158158
"observer copy assignment converting operator empty to empty",
159159
"[assignment][observer]",
160160
owner_types) {
161-
memory_tracker mem_track;
161+
volatile memory_tracker mem_track;
162162

163163
if constexpr (has_base<TestType>) {
164164
{
@@ -179,13 +179,13 @@ TEMPLATE_LIST_TEST_CASE(
179179

180180
CHECK_NO_LEAKS;
181181
}
182-
};
182+
}
183183

184184
TEMPLATE_LIST_TEST_CASE(
185185
"observer copy assignment converting operator valid to valid",
186186
"[assignment][observer]",
187187
owner_types) {
188-
memory_tracker mem_track;
188+
volatile memory_tracker mem_track;
189189

190190
if constexpr (has_base<TestType>) {
191191
{
@@ -208,11 +208,11 @@ TEMPLATE_LIST_TEST_CASE(
208208

209209
CHECK_NO_LEAKS;
210210
}
211-
};
211+
}
212212

213213
TEMPLATE_LIST_TEST_CASE(
214214
"observer copy assignment operator self to self valid", "[assignment][observer]", owner_types) {
215-
memory_tracker mem_track;
215+
volatile memory_tracker mem_track;
216216

217217
{
218218
TestType ptr = make_pointer_deleter_1<TestType>();
@@ -228,11 +228,11 @@ TEMPLATE_LIST_TEST_CASE(
228228
}
229229

230230
CHECK_NO_LEAKS;
231-
};
231+
}
232232

233233
TEMPLATE_LIST_TEST_CASE(
234234
"observer copy assignment operator self to self empty", "[assignment][observer]", owner_types) {
235-
memory_tracker mem_track;
235+
volatile memory_tracker mem_track;
236236

237237
{
238238
observer_ptr<TestType> optr;
@@ -247,4 +247,4 @@ TEMPLATE_LIST_TEST_CASE(
247247
}
248248

249249
CHECK_NO_LEAKS;
250-
};
250+
}

0 commit comments

Comments
 (0)