[m-dev.] diff: fix compile errors in dgj's change

[Fergus Henderson]

Estimated hours taken: 0.25

compiler/base_type_layout.m:
compiler/base_typeclass_info.m:
	Fix compilation errors in dgj's recent check-in.
	These errors were due to a conflict with stayl's 
	check-in of a few days ago.

Workspace: /mnt/hydra/home/hydra/public/test_mercury/test_dirs/hydra/mercury
Index: compiler/base_type_layout.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/base_type_layout.m,v
retrieving revision 1.47
diff -u -d -r1.47 base_type_layout.m
--- compiler/base_type_layout.m	1999/12/09 04:39:45	1.47
+++ compiler/base_type_layout.m	1999/12/09 14:57:19
@@ -1034,7 +1034,7 @@
 	FirstConstraint = constraint(ClassName, Args),
 	list__length(Args, ClassArity),
 	map__lookup(ClassTable, class_id(ClassName, ClassArity), ClassDefn),
-	ClassDefn = hlds_class_defn(SuperClasses, _, _, _, _),
+	ClassDefn = hlds_class_defn(SuperClasses, _, _, _, _, _, _),
 	list__length(SuperClasses, NumSuperClasses),
 	RealTypeInfoIndex = TypeInfoIndex + NumSuperClasses,
 	make_indirect_typeinfo_index(ThisN, RealTypeInfoIndex, Rval),
Index: compiler/base_typeclass_info.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/base_typeclass_info.m,v
retrieving revision 1.14
diff -u -d -r1.14 base_typeclass_info.m
--- compiler/base_typeclass_info.m	1999/12/09 04:39:46	1.14
+++ compiler/base_typeclass_info.m	1999/12/09 14:57:31
@@ -155,7 +155,8 @@
 		SuperArg, ArityArg) :-
 	module_info_classes(ModuleInfo, ClassTable),
 	map__lookup(ClassTable, ClassId, ClassDefn),
-	ClassDefn = hlds_class_defn(SuperClassConstraints, ClassVars, _, _, _),
+	ClassDefn = hlds_class_defn(SuperClassConstraints, ClassVars,
+			_, _, _, _, _),
 	list__length(SuperClassConstraints, NumSuper),
 	list__length(ClassVars, NumVars),
 	SuperArg = yes(const(int_const(NumSuper))),

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- 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
--------------------------------------------------------------------------