[m-rev.] diff: fix for new type_ctor_info layout on .NET

[Zoltan Somogyi]

On 15-Jan-2002, Peter Ross <peter.ross at miscrit.be> wrote:
> Index: runtime/mercury_mcpp.h
> ===================================================================
> RCS file: /home/mercury1/repository/mercury/runtime/mercury_mcpp.h,v
> retrieving revision 1.12
> diff -u -r1.12 mercury_mcpp.h
> --- runtime/mercury_mcpp.h	24 Oct 2001 07:43:24 -0000	1.12
> +++ runtime/mercury_mcpp.h	15 Jan 2002 23:46:29 -0000
> @@ -166,7 +166,9 @@
>      MR_STRUCT_INIT(MR_PASTE5(mercury_data_, __type_ctor_info_, n, _, a) = {)   \
>      MR_CLASS_INIT(MR_PASTE4(type_ctor_init_, n, _, a))   		\
>  	MR_BOX_INT(a),							\
> -	MR_MAYBE_STATIC_CODE(n##_unify),				\
> +	MR_RTTI_VERSION,						\
> +	MR_TYPECTOR_REP(cr),						\
> +	MR_BOX_INT(-1),							\
>  	MR_MAYBE_STATIC_CODE(n##_unify),				\
>  	MR_MAYBE_STATIC_CODE(n##_compare),				\
>  	MR_TYPECTOR_REP(cr),						\
> @@ -175,8 +177,6 @@
>  	MR_string_const(MR_STRINGIFY(m), sizeof(MR_STRINGIFY(m))-1),	\
>  	MR_string_const(MR_STRINGIFY(n), sizeof(MR_STRINGIFY(n))-1),	\
>  	MR_RTTI_VERSION,						\
> -	NULL,								\
> -	NULL,								\
>  	MR_BOX_INT(-1),							\
>  	MR_BOX_INT(-1)							\
>      MR_STRUCT_INIT_END(})						\

I don't think this is right. The old version should be followed by the functors
field, the layout field and the num_functors field, but you have only two -1s
in there.

Zoltan.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------