Changeset 2a301ff for libcfa/src/virtual_dtor.hfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• libcfa/src/virtual_dtor.hfa (modified) (2 diffs)

libcfa/src/virtual_dtor.hfa

@@ -1 @@
-// inline this structure to have a virtual dtor.
+#pragma once
+
+// inline virtual_dtor to have a virtual dtor.
 // when using this, delete() is also virtual and will be called on the right address
 // using free() directly on polymorphic types may result in unaligned memory deallocation
@@ -8 +10 @@
 //     given struct A { inline virtual_dtor; } and struct B { inline virtual_dtor; }
 //     struct C { inline A; inline B; } will result in undefined behaviour
-
 struct virtual_dtor {
     void (*__virtual_dtor_ptr)(virtual_dtor &);