@@ -152,94 +152,112 @@ class PrivateMoveAssign { // NON_COMPLIANT
152152namespace additional_requirements {
153153
154154class CustomizedCopyCtorCompliant { // COMPLIANT
155+ public:
155156 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedCopyCtorCompliant, CUSTOMIZED , DEFAULTED ,
156157 DEFAULTED , DEFAULTED , CUSTOMIZED )
157158};
158159
159160class CustomizedMoveCtorCompliant { // COMPLIANT
161+ public:
160162 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedMoveCtorCompliant, DEFAULTED , CUSTOMIZED ,
161163 DEFAULTED , DEFAULTED , CUSTOMIZED )
162164};
163165
164166class CustomizedCopyAssignCompliant { // COMPLIANT
167+ public:
165168 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedCopyAssignCompliant, DEFAULTED ,
166169 DEFAULTED , CUSTOMIZED , DEFAULTED , CUSTOMIZED )
167170};
168171
169172class CustomizedMoveAssignCompliant { // COMPLIANT
173+ public:
170174 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedMoveAssignCompliant, DEFAULTED ,
171175 DEFAULTED , DEFAULTED , CUSTOMIZED , CUSTOMIZED )
172176};
173177
174178class CustomizedCopyCtorDefaultDtor { // NON_COMPLIANT
179+ public:
175180 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedCopyCtorDefaultDtor, CUSTOMIZED ,
176181 DEFAULTED , DEFAULTED , DEFAULTED , DEFAULTED )
177182};
178183
179184class CustomizedCopyCtorDeletedDtor { // NON_COMPLIANT
185+ public:
180186 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedCopyCtorDeletedDtor, CUSTOMIZED ,
181187 DEFAULTED , DEFAULTED , DEFAULTED , DELETED )
182188};
183189
184190class CustomizedMoveCtorNonCompliant { // NON_COMPLIANT
191+ public:
185192 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedMoveCtorNonCompliant, CUSTOMIZED ,
186193 DEFAULTED , DEFAULTED , DEFAULTED , DEFAULTED )
187194};
188195
189196class CustomizedCopyAssignNonCompliant { // NON_COMPLIANT
197+ public:
190198 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedCopyAssignNonCompliant, DEFAULTED ,
191199 DEFAULTED , CUSTOMIZED , DEFAULTED , DEFAULTED )
192200};
193201
194202class CustomizedMoveAssignNonCompliant { // NON_COMPLIANT
203+ public:
195204 DEFINE_ALL_SPECIAL_MEMBERS (CustomizedMoveAssignNonCompliant, DEFAULTED ,
196205 DEFAULTED , DEFAULTED , CUSTOMIZED , DEFAULTED )
197206};
198207
199208// Move-only with a customized dtor requires customized move operations.
200209class MoveOnlyNotCustomizedNonCompliant { // NON_COMPLIANT
210+ public:
201211 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyNotCustomizedNonCompliant, DELETED ,
202212 DEFAULTED , DELETED , DELETED , CUSTOMIZED )
203213};
204214
205215// Move-only with a customized dtor requires customized move operations.
206216class MoveOnlyAssignableNotCustomizedNonCompliant { // NON_COMPLIANT
217+ public:
207218 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyAssignableNotCustomizedNonCompliant,
208219 DELETED , DEFAULTED , DELETED , DEFAULTED , CUSTOMIZED )
209220};
210221
211222class MoveOnlyCustomizedCompliant { // COMPLIANT -- customized move
223+ public:
212224 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyCustomizedCompliant, DELETED , CUSTOMIZED ,
213225 DELETED , DELETED , CUSTOMIZED )
214226};
215227
216228class MoveOnlyAssignableCustomizedCompliant { // COMPLIANT -- customized move
229+ public:
217230 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyAssignableCustomizedCompliant, DELETED ,
218231 CUSTOMIZED , DELETED , CUSTOMIZED , CUSTOMIZED )
219232};
220233
221234class MoveOnlyNotCustomizedCompliant { // COMPLIANT -- default dtor
235+ public:
222236 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyNotCustomizedCompliant, DELETED , DEFAULTED ,
223237 DELETED , DELETED , DEFAULTED )
224238};
225239
226240class MoveOnlyAssignableNotCustomizedCompliant { // COMPLIANT -- default dtor
241+ public:
227242 DEFINE_ALL_SPECIAL_MEMBERS (MoveOnlyAssignableNotCustomizedCompliant, DELETED ,
228243 DEFAULTED , DELETED , DEFAULTED , DEFAULTED )
229244};
230245
231246// Copy-enabled with customized dtor requires customized copy and move
232247class CopyEnabledCustomizedDtorNonCompliant { // NON_COMPLIANT
248+ public:
233249 DEFINE_ALL_SPECIAL_MEMBERS (CopyEnabledCustomizedDtorNonCompliant, DEFAULTED ,
234250 DEFAULTED , DEFAULTED , DEFAULTED , CUSTOMIZED )
235251};
236252
237253class CopyEnabledNonCustomizedDtorCompliant { // COMPLIANT
254+ public:
238255 DEFINE_ALL_SPECIAL_MEMBERS (CopyEnabledNonCustomizedDtorCompliant, DEFAULTED ,
239256 DEFAULTED , DEFAULTED , DEFAULTED , DEFAULTED )
240257};
241258
242259class CopyEnabledCustomizedDtorCompliant { // COMPLIANT
260+ public:
243261 DEFINE_ALL_SPECIAL_MEMBERS (CopyEnabledCustomizedDtorCompliant, CUSTOMIZED ,
244262 CUSTOMIZED , CUSTOMIZED , CUSTOMIZED , CUSTOMIZED )
245263};
0 commit comments