Skip to content

Commit 77cb804

Browse files
committed
Fix formatting of test case
1 parent d25ef97 commit 77cb804

File tree

1 file changed

+43
-56
lines changed
  • cpp/misra/test/rules/RULE-21-6-2

1 file changed

+43
-56
lines changed

cpp/misra/test/rules/RULE-21-6-2/test.cpp

Lines changed: 43 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ class C1 {
1414
// Item 1: Any non-placement form of new or delete
1515

1616
void use_of_new() {
17-
C1 x1; // COMPLIANT: no use of new
18-
C1 x2{}; // COMPLIANT: no use of new
17+
C1 x1; // COMPLIANT: no use of new
18+
C1 x2{}; // COMPLIANT: no use of new
1919
C1 *x3 = new C1;
20-
// NON_COMPLIANT: use of new
20+
// NON_COMPLIANT: use of new
2121
C1 *x4 = new (&x1) C1; // COMPLIANT: placement new (but violates Rule 21.6.3)
2222
}
2323

@@ -220,9 +220,8 @@ void take_address_of_operator_delete() {
220220
::operator delete; // NON_COMPLIANT: implicit address of operator delete
221221
void (*p3)(void *) =
222222
&::operator delete[]; // NON_COMPLIANT: address of operator delete[]
223-
void (*p4)(void *) =
224-
::operator delete[]; // NON_COMPLIANT: implicit address of operator
225-
// delete[]
223+
void (*p4)(void *) = ::operator delete[]; // NON_COMPLIANT: implicit address
224+
// of operator delete[]
226225

227226
void (*p5)(void *, const std::nothrow_t &) =
228227
&::operator delete; // NON_COMPLIANT: address of nothrow operator delete
@@ -241,86 +240,74 @@ void take_address_of_operator_delete() {
241240

242241
void take_address_of_allocate_deallocate() {
243242
// std::allocator
244-
auto p1 =
245-
&std::allocator<C1>::allocate; // NON_COMPLIANT: address of
246-
// std::allocator::allocate
247-
auto p2 =
248-
&std::allocator<C1>::deallocate; // NON_COMPLIANT: address of
249-
// std::allocator::deallocate
243+
auto p1 = &std::allocator<C1>::allocate; // NON_COMPLIANT: address of
244+
// std::allocator::allocate
245+
auto p2 = &std::allocator<C1>::deallocate; // NON_COMPLIANT: address of
246+
// std::allocator::deallocate
250247

251248
// std::allocator_traits (static member functions)
252249
using Traits = std::allocator_traits<std::allocator<C1>>;
253-
C1* (*p3)(std::allocator<C1>&, std::size_t) =
250+
C1 *(*p3)(std::allocator<C1> &, std::size_t) =
254251
&Traits::allocate; // NON_COMPLIANT: address of
255-
// std::allocator_traits::allocate
256-
void (*p4)(std::allocator<C1>&, C1*, std::size_t) =
252+
// std::allocator_traits::allocate
253+
void (*p4)(std::allocator<C1> &, C1 *, std::size_t) =
257254
&Traits::deallocate; // NON_COMPLIANT: address of
258-
// std::allocator_traits::deallocate
255+
// std::allocator_traits::deallocate
259256

260257
// std::pmr::memory_resource
261-
auto p5 =
262-
&std::pmr::memory_resource::allocate; // NON_COMPLIANT: address of
263-
// memory_resource::allocate
258+
auto p5 = &std::pmr::memory_resource::allocate; // NON_COMPLIANT: address of
259+
// memory_resource::allocate
264260
auto p6 =
265261
&std::pmr::memory_resource::deallocate; // NON_COMPLIANT: address of
266262
// memory_resource::deallocate
267263

268264
// std::pmr::polymorphic_allocator
269-
auto p7 =
270-
&std::pmr::polymorphic_allocator<
271-
C1>::allocate; // NON_COMPLIANT: address of
272-
// polymorphic_allocator::allocate
273-
auto p8 =
274-
&std::pmr::polymorphic_allocator<
275-
C1>::deallocate; // NON_COMPLIANT: address of
276-
// polymorphic_allocator::deallocate
265+
auto p7 = &std::pmr::polymorphic_allocator<
266+
C1>::allocate; // NON_COMPLIANT: address of
267+
// polymorphic_allocator::allocate
268+
auto p8 = &std::pmr::polymorphic_allocator<
269+
C1>::deallocate; // NON_COMPLIANT: address of
270+
// polymorphic_allocator::deallocate
277271

278272
// std::pmr::monotonic_buffer_resource
279-
auto p9 =
280-
&std::pmr::monotonic_buffer_resource::
281-
allocate; // NON_COMPLIANT: address of
282-
// monotonic_buffer_resource::allocate
283-
auto p10 =
284-
&std::pmr::monotonic_buffer_resource::
285-
deallocate; // NON_COMPLIANT: address of
286-
// monotonic_buffer_resource::deallocate
273+
auto p9 = &std::pmr::monotonic_buffer_resource::
274+
allocate; // NON_COMPLIANT: address of
275+
// monotonic_buffer_resource::allocate
276+
auto p10 = &std::pmr::monotonic_buffer_resource::
277+
deallocate; // NON_COMPLIANT: address of
278+
// monotonic_buffer_resource::deallocate
287279

288280
// std::pmr::unsynchronized_pool_resource
289-
auto p11 =
290-
&std::pmr::unsynchronized_pool_resource::
291-
allocate; // NON_COMPLIANT: address of
292-
// unsynchronized_pool_resource::allocate
293-
auto p12 =
294-
&std::pmr::unsynchronized_pool_resource::
295-
deallocate; // NON_COMPLIANT: address of
296-
// unsynchronized_pool_resource::deallocate
281+
auto p11 = &std::pmr::unsynchronized_pool_resource::
282+
allocate; // NON_COMPLIANT: address of
283+
// unsynchronized_pool_resource::allocate
284+
auto p12 = &std::pmr::unsynchronized_pool_resource::
285+
deallocate; // NON_COMPLIANT: address of
286+
// unsynchronized_pool_resource::deallocate
297287

298288
// std::pmr::synchronized_pool_resource
299-
auto p13 =
300-
&std::pmr::synchronized_pool_resource::
301-
allocate; // NON_COMPLIANT: address of
302-
// synchronized_pool_resource::allocate
303-
auto p14 =
304-
&std::pmr::synchronized_pool_resource::
305-
deallocate; // NON_COMPLIANT: address of
306-
// synchronized_pool_resource::deallocate
289+
auto p13 = &std::pmr::synchronized_pool_resource::
290+
allocate; // NON_COMPLIANT: address of
291+
// synchronized_pool_resource::allocate
292+
auto p14 = &std::pmr::synchronized_pool_resource::
293+
deallocate; // NON_COMPLIANT: address of
294+
// synchronized_pool_resource::deallocate
307295

308296
// std::scoped_allocator_adaptor (non-static member functions)
309297
using ScopedAlloc = std::scoped_allocator_adaptor<std::allocator<C1>>;
310-
C1* (ScopedAlloc::*p15)(std::size_t) =
298+
C1 *(ScopedAlloc::*p15)(std::size_t) =
311299
&ScopedAlloc::allocate; // NON_COMPLIANT: address of
312300
// scoped_allocator_adaptor::allocate
313-
void (ScopedAlloc::*p16)(C1*, std::size_t) =
301+
void (ScopedAlloc::*p16)(C1 *, std::size_t) =
314302
&ScopedAlloc::deallocate; // NON_COMPLIANT: address of
315303
// scoped_allocator_adaptor::deallocate
316304
}
317305

318306
// Taking address of std::unique_ptr::release (Item 4)
319307

320308
void take_address_of_unique_ptr_release() {
321-
auto p1 =
322-
&std::unique_ptr<C1>::release; // NON_COMPLIANT: address of
323-
// std::unique_ptr::release
309+
auto p1 = &std::unique_ptr<C1>::release; // NON_COMPLIANT: address of
310+
// std::unique_ptr::release
324311
auto p2 =
325312
&std::unique_ptr<C1[]>::release; // NON_COMPLIANT: address of
326313
// std::unique_ptr::release (array form)

0 commit comments

Comments
 (0)