[m-dev.] diff: fix univ-related bug in --high-level-data grades

[Fergus Henderson]

Estimated hours taken: 0.75

runtime/mercury.h:
    Remove the declarations of the unify and compare functions for
    univ; these functions are no longer defined in mercury.c,
    since univ is no longer a builtin type.
    The declarations here were clashing with the automatically-generated
    ones in --high-level-data grades. 
    (The clash was actually because we are including the wrong version
    of the header files when compiling things in --high-level-data
    grades, but previously that problem only resulted in compiler
    warnings, whereas here it caused a compiler error.)

Workspace: /home/hg/fjh/mercury
Index: runtime/mercury.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury.h,v
retrieving revision 1.31
diff -u -d -r1.31 mercury.h
--- runtime/mercury.h	2001/01/12 14:08:47	1.31
+++ runtime/mercury.h	2001/01/14 02:48:55
@@ -379,7 +379,6 @@
 bool MR_CALL mercury__builtin____Unify____pred_0_0(MR_Pred x, MR_Pred y); 
 bool MR_CALL mercury__builtin____Unify____tuple_0_0(
 	MR_Mercury_Type_Info type_info, MR_Tuple x, MR_Tuple y); 
-bool MR_CALL mercury__std_util____Unify____univ_0_0(MR_Univ x, MR_Univ y); 
 bool MR_CALL mercury__std_util____Unify____type_desc_0_0(
 	MR_Type_Desc x, MR_Type_Desc y); 
 bool MR_CALL mercury__private_builtin____Unify____type_ctor_info_1_0(
@@ -414,8 +413,6 @@
 void MR_CALL mercury__builtin____Compare____tuple_0_0(
 	MR_Mercury_Type_Info type_info, MR_Comparison_Result *result,
 	MR_Tuple x, MR_Tuple y); 
-void MR_CALL mercury__std_util____Compare____univ_0_0(
-	MR_Comparison_Result *result, MR_Univ x, MR_Univ y);
 void MR_CALL mercury__std_util____Compare____type_desc_0_0(
 	MR_Comparison_Result *result, MR_Type_Desc x, MR_Type_Desc y);
 void MR_CALL mercury__private_builtin____Compare____type_ctor_info_1_0(

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------