[m-rev.] trivial diff: fix compilation fo ODBC interface

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main

Fix some compilation errors in the ODBC interface.

extras/odbc/odbc.m:
	Module qualify cons/3 because it now clashes with
	list.cons/3.

Julien.

Index: odbc.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/odbc/odbc.m,v
retrieving revision 1.15
diff -u -r1.15 odbc.m
--- odbc.m	19 Apr 2002 02:51:57 -0000	1.15
+++ odbc.m	5 Jul 2004 02:47:59 -0000
@@ -817,13 +817,14 @@
 	% XXX optimize this when we have better support
 	% for last call optimization.
 	odbc__do_aggregate(odbc__execute_statement(SQLString),
-		cons, [], Results0),
+		odbc__cons, [], Results0),
 	{ list__reverse(Results0, Results) }.

 odbc__aggregate(SQLString, Accumulator, Acc0, Acc) -->
 	odbc__do_aggregate(odbc__execute_statement(SQLString),
 		Accumulator, Acc0, Acc).

+	% XXX Remove this and use list.cons/3 after the next release.
 :- pred cons(T, list(T), list(T)).
 :- mode cons(in, in, out) is det.

@@ -2085,7 +2086,7 @@
 	{ odbc__convert_pattern_argument(TableName, TableStr, TableStatus) },
 	odbc__do_aggregate(odbc__sql_tables(QualifierStr, QualifierStatus,
 		OwnerStr, OwnerStatus, TableStr, TableStatus),
-		cons, [], Results0),
+		odbc__cons, [], Results0),
 	{ list__reverse(Results0, Results) },
 	( { list__map(odbc__convert_table_desc, Results, Tables0) } ->
 		{ Tables = Tables0 }

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------