@@ -178,7 +178,8 @@ class CustomizedAssignsCompliant { // COMPLIANT: copy-enabled (2)
178178 CUSTOMIZED, CUSTOMIZED, CUSTOMIZED)
179179};
180180
181- class CustomizedCopyCtorDefaultedNonCompliant { // NON_COMPLIANT: copy-enabled (2)
181+ // copy-enabled (2)
182+ class CustomizedCopyCtorDefaultedNonCompliant { // NON_COMPLIANT
182183public:
183184 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedCopyCtorDefaultedNonCompliant,
184185 CUSTOMIZED, DEFAULTED, DEFAULTED, DEFAULTED,
@@ -218,31 +219,36 @@ class MoveOnlyNotCustomizedNonCompliant { // NON_COMPLIANT: move-only (1)
218219
219220// Move-only with a customized dtor requires customized move assignment
220221// operator.
221- class MoveOnlyAssignableNotCustomizedNonCompliant { // NON_COMPLIANT: move-only (2)
222+ // move-only (2)
223+ class MoveOnlyAssignableNotCustomizedNonCompliant { // NON_COMPLIANT
222224public:
223225 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyAssignableNotCustomizedNonCompliant,
224226 DELETED, DEFAULTED, DELETED, DEFAULTED, CUSTOMIZED)
225227};
226228
227- class MoveOnlyCustomizedCompliant { // COMPLIANT -- customized move: move-only (1)
229+ // customized move: move-only (1)
230+ class MoveOnlyCustomizedCompliant { // COMPLIANT
228231public:
229232 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyCustomizedCompliant, DELETED, CUSTOMIZED,
230233 DELETED, DELETED, CUSTOMIZED)
231234};
232235
233- class MoveOnlyAssignableCustomizedCompliant { // COMPLIANT -- customized move: move-only (2)
236+ // customized move: move-only (2)
237+ class MoveOnlyAssignableCustomizedCompliant { // COMPLIANT
234238public:
235239 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyAssignableCustomizedCompliant, DELETED,
236240 CUSTOMIZED, DELETED, CUSTOMIZED, CUSTOMIZED)
237241};
238242
239- class MoveOnlyNotCustomizedCompliant { // COMPLIANT -- default dtor: move-only (1)
243+ // default dtor: move-only (1)
244+ class MoveOnlyNotCustomizedCompliant { // COMPLIANT
240245public:
241246 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyNotCustomizedCompliant, DELETED, DEFAULTED,
242247 DELETED, DELETED, DEFAULTED)
243248};
244249
245- class MoveOnlyAssignableNotCustomizedCompliant { // COMPLIANT -- default dtor: move-only (2)
250+ // default dtor: move-only (2)
251+ class MoveOnlyAssignableNotCustomizedCompliant { // COMPLIANT
246252public:
247253 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyAssignableNotCustomizedCompliant, DELETED,
248254 DEFAULTED, DELETED, DEFAULTED, DEFAULTED)
@@ -273,75 +279,86 @@ class CopyEnabledCustomizedDtorCompliant2 { // COMPLIANT: copy-enabled (2)
273279 DEFAULTED, CUSTOMIZED, DEFAULTED, CUSTOMIZED)
274280};
275281
276- class CopyAssignableCustomizedDtorCompliant1 { // COMPLIANT: copy-assignable class with both move operations customized
282+ // copy-assignable class with both move operations customized
283+ class CopyAssignableCustomizedDtorCompliant1 { // COMPLIANT
277284public:
278285 DEFINE_ALL_SPECIAL_MEMBERS (CopyAssignableCustomizedDtorCompliant1, DEFAULTED,
279286 CUSTOMIZED, CUSTOMIZED, CUSTOMIZED, CUSTOMIZED)
280287};
281288
282- class CopyAssignableCustomizedDtorCompliant2 { // COMPLIANT: copy-assignable class with both move operations not declared
289+ // copy-assignable class with both move operations not declared
290+ class CopyAssignableCustomizedDtorCompliant2 { // COMPLIANT
283291public:
284- COPY_CTOR (CopyAssignableCustomizedDtorCompliant2) DEFAULTED
292+ COPY_CTOR (CopyAssignableCustomizedDtorCompliant2)
293+ DEFAULTED
285294 // Move constructor is not declared
286- COPY_ASSIGN (CopyAssignableCustomizedDtorCompliant2) CUSTOMIZED
295+ COPY_ASSIGN (CopyAssignableCustomizedDtorCompliant2)
296+ CUSTOMIZED
287297 // Move assignment operator is not declared
288298 DTOR (CopyAssignableCustomizedDtorCompliant2) CUSTOMIZED
289299};
290300
291- class CopyAssignableCustomizedDtorNonCompliant1 { // NON_COMPLIANT: copy-assignable class with only one of move operations not declared
301+ // copy-assignable class with only one of move operations not declared
302+ class CopyAssignableCustomizedDtorNonCompliant1 { // NON_COMPLIANT
292303public:
293- COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant1) CUSTOMIZED
294- MOVE_CTOR (CopyAssignableCustomizedDtorNonCompliant1) CUSTOMIZED
295- COPY_ASSIGN (CopyAssignableCustomizedDtorNonCompliant1) CUSTOMIZED
296- // Move assignment operator is not declared
297- DTOR (CopyAssignableCustomizedDtorNonCompliant1) CUSTOMIZED
304+ COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant1)
305+ CUSTOMIZED MOVE_CTOR (CopyAssignableCustomizedDtorNonCompliant1) CUSTOMIZED
306+ COPY_ASSIGN(CopyAssignableCustomizedDtorNonCompliant1) CUSTOMIZED
307+ // Move assignment operator is not declared
308+ DTOR(CopyAssignableCustomizedDtorNonCompliant1) CUSTOMIZED
298309};
299310
300- class CopyAssignableCustomizedDtorNonCompliant2 { // NON_COMPLIANT: copy-assignable class with only one of move operations not declared
311+ // copy-assignable class with only one of move operations not declared
312+ class CopyAssignableCustomizedDtorNonCompliant2 { // NON_COMPLIANT
301313public:
302- COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant2) CUSTOMIZED
314+ COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant2)
315+ CUSTOMIZED
303316 // Move constructor is not declared
304- COPY_ASSIGN (CopyAssignableCustomizedDtorNonCompliant2) CUSTOMIZED
305- MOVE_ASSIGN (CopyAssignableCustomizedDtorNonCompliant2) CUSTOMIZED
306- DTOR (CopyAssignableCustomizedDtorNonCompliant2) CUSTOMIZED
317+ COPY_ASSIGN (CopyAssignableCustomizedDtorNonCompliant2)
318+ CUSTOMIZED MOVE_ASSIGN (CopyAssignableCustomizedDtorNonCompliant2) CUSTOMIZED
319+ DTOR(CopyAssignableCustomizedDtorNonCompliant2) CUSTOMIZED
307320};
308321
309- class CopyAssignableCustomizedDtorNonCompliant3 { // NON_COMPLIANT: copy-assignable class with only one of move operations not declared
322+ // copy-assignable class with only one of move operations not declared
323+ class CopyAssignableCustomizedDtorNonCompliant3 { // NON_COMPLIANT
310324public:
311-
312- COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant3) CUSTOMIZED
313- MOVE_CTOR (CopyAssignableCustomizedDtorNonCompliant3) CUSTOMIZED
314- // Copy assignment operator is not declared
315- MOVE_ASSIGN (CopyAssignableCustomizedDtorNonCompliant3) CUSTOMIZED
316- DTOR (CopyAssignableCustomizedDtorNonCompliant3) CUSTOMIZED
317-
325+ COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant3)
326+ CUSTOMIZED MOVE_CTOR (CopyAssignableCustomizedDtorNonCompliant3) CUSTOMIZED
327+ // Copy assignment operator is not declared
328+ MOVE_ASSIGN(CopyAssignableCustomizedDtorNonCompliant3) CUSTOMIZED
329+ DTOR(CopyAssignableCustomizedDtorNonCompliant3) CUSTOMIZED
318330};
319331
320- class CopyAssignableCustomizedDtorNonCompliant4 { // NON_COMPLIANT: copy-assignable class with only one of move operations not declared
332+ // copy-assignable class with only one of move operations not declared
333+ class CopyAssignableCustomizedDtorNonCompliant4 { // NON_COMPLIANT
321334public:
322- COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant4) CUSTOMIZED
335+ COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant4)
336+ CUSTOMIZED
323337 // Move constructor is not declared
324- COPY_ASSIGN (CopyAssignableCustomizedDtorNonCompliant4) CUSTOMIZED
325- MOVE_ASSIGN (CopyAssignableCustomizedDtorNonCompliant4) CUSTOMIZED
326- DTOR (CopyAssignableCustomizedDtorNonCompliant4) CUSTOMIZED
338+ COPY_ASSIGN (CopyAssignableCustomizedDtorNonCompliant4)
339+ CUSTOMIZED MOVE_ASSIGN (CopyAssignableCustomizedDtorNonCompliant4) CUSTOMIZED
340+ DTOR(CopyAssignableCustomizedDtorNonCompliant4) CUSTOMIZED
327341};
328342
329- class CopyAssignableCustomizedDtorNonCompliant5 { // NON_COMPLIANT: copy-assignable class with only one of move operations not declared
343+ // copy-assignable class with only one of move operations not declared
344+ class CopyAssignableCustomizedDtorNonCompliant5 { // NON_COMPLIANT
330345public:
331- COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant5) CUSTOMIZED
332- MOVE_CTOR (CopyAssignableCustomizedDtorNonCompliant5) DEFAULTED
333- COPY_ASSIGN (CopyAssignableCustomizedDtorNonCompliant5) CUSTOMIZED
334- // Move assignment operator is not declared
335- DTOR (CopyAssignableCustomizedDtorNonCompliant5) CUSTOMIZED
346+ COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant5)
347+ CUSTOMIZED MOVE_CTOR (CopyAssignableCustomizedDtorNonCompliant5) DEFAULTED
348+ COPY_ASSIGN(CopyAssignableCustomizedDtorNonCompliant5) CUSTOMIZED
349+ // Move assignment operator is not declared
350+ DTOR(CopyAssignableCustomizedDtorNonCompliant5) CUSTOMIZED
336351};
337352
338- class CopyAssignableCustomizedDtorNonCompliant6 { // NON_COMPLIANT: copy-assignable class with only one of move operations not declared
353+ // copy-assignable class with only one of move operations not declared
354+ class CopyAssignableCustomizedDtorNonCompliant6 { // NON_COMPLIANT
339355public:
340- COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant6) CUSTOMIZED
356+ COPY_CTOR (CopyAssignableCustomizedDtorNonCompliant6)
357+ CUSTOMIZED
341358 // Move constructor is not declared
342- COPY_ASSIGN (CopyAssignableCustomizedDtorNonCompliant6) CUSTOMIZED
343- MOVE_ASSIGN (CopyAssignableCustomizedDtorNonCompliant6) DEFAULTED
344- DTOR (CopyAssignableCustomizedDtorNonCompliant6) CUSTOMIZED
359+ COPY_ASSIGN (CopyAssignableCustomizedDtorNonCompliant6)
360+ CUSTOMIZED MOVE_ASSIGN (CopyAssignableCustomizedDtorNonCompliant6) DEFAULTED
361+ DTOR(CopyAssignableCustomizedDtorNonCompliant6) CUSTOMIZED
345362};
346363
347364// A public unmovable base class shall have a public virtual destructor
0 commit comments