ObjFW  Diff

Differences From Artifact [4886f63f00]:

To Artifact [f378d99417]:


17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
#include "config.h"

#import "OFObject.h"

static SEL cxx_construct = NULL;
static SEL cxx_destruct = NULL;

static BOOL
call_ctors(Class cls, id obj)
{
	Class super = class_getSuperclass(cls);
	id (*ctor)(id, SEL);
	id (*last)(id, SEL);

	if (super != nil)
		if (!call_ctors(super, obj))
			return NO;

	if (cxx_construct == NULL)
		cxx_construct = sel_registerName(".cxx_construct");

	if (!class_respondsToSelector(cls, cxx_construct))
		return YES;

	ctor = (id(*)(id, SEL))
	    class_getMethodImplementation(cls, cxx_construct);
	last = (id(*)(id, SEL))
	    class_getMethodImplementation(super, cxx_construct);

	if (ctor == last)
		return YES;

	return (ctor(obj, cxx_construct) != nil ? YES : NO);
}

id
objc_constructInstance(Class cls, void *bytes)
{
	id obj = (id)bytes;








|








|





|







|

|







17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
#include "config.h"

#import "OFObject.h"

static SEL cxx_construct = NULL;
static SEL cxx_destruct = NULL;

static bool
call_ctors(Class cls, id obj)
{
	Class super = class_getSuperclass(cls);
	id (*ctor)(id, SEL);
	id (*last)(id, SEL);

	if (super != nil)
		if (!call_ctors(super, obj))
			return false;

	if (cxx_construct == NULL)
		cxx_construct = sel_registerName(".cxx_construct");

	if (!class_respondsToSelector(cls, cxx_construct))
		return true;

	ctor = (id(*)(id, SEL))
	    class_getMethodImplementation(cls, cxx_construct);
	last = (id(*)(id, SEL))
	    class_getMethodImplementation(super, cxx_construct);

	if (ctor == last)
		return true;

	return (ctor(obj, cxx_construct) != nil);
}

id
objc_constructInstance(Class cls, void *bytes)
{
	id obj = (id)bytes;