HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into boehm-demers-weiser-gc
[bpt/guile.git]
/
libguile
/
goops.c
diff --git
a/libguile/goops.c
b/libguile/goops.c
index
b3dfe0d
..
ac3df65
100644
(file)
--- a/
libguile/goops.c
+++ b/
libguile/goops.c
@@
-737,9
+737,8
@@
SCM_DEFINE (scm_sys_inherit_magic_x, "%inherit-magic!", 2, 0, 0,
ls = SCM_CDR (ls);
}
flags &= SCM_CLASSF_INHERIT;
ls = SCM_CDR (ls);
}
flags &= SCM_CLASSF_INHERIT;
- if (flags & SCM_CLASSF_ENTITY)
- SCM_SET_CLASS_DESTRUCTOR (class, scm_struct_free_entity);
- else
+
+ if (! (flags & SCM_CLASSF_ENTITY))
{
long n = SCM_I_INUM (SCM_SLOT (class, scm_si_nfields));
#if 0
{
long n = SCM_I_INUM (SCM_SLOT (class, scm_si_nfields));
#if 0
@@
-756,7
+755,6
@@
SCM_DEFINE (scm_sys_inherit_magic_x, "%inherit-magic!", 2, 0, 0,
{
/* NOTE: The following depends on scm_struct_i_size. */
flags |= SCM_STRUCTF_LIGHT + n * sizeof (SCM); /* use light representation */
{
/* NOTE: The following depends on scm_struct_i_size. */
flags |= SCM_STRUCTF_LIGHT + n * sizeof (SCM); /* use light representation */
- SCM_SET_CLASS_DESTRUCTOR (class, scm_struct_free_light);
}
}
SCM_SET_CLASS_FLAGS (class, flags);
}
}
SCM_SET_CLASS_FLAGS (class, flags);
@@
-2819,7
+2817,6
@@
scm_make_class (SCM meta, char *s_name, SCM supers, size_t size,
}
else if (size > 0)
{
}
else if (size > 0)
{
- SCM_SET_CLASS_DESTRUCTOR (class, scm_struct_free_light);
SCM_SET_CLASS_INSTANCE_SIZE (class, size);
}
SCM_SET_CLASS_INSTANCE_SIZE (class, size);
}