On Sun, Feb 08, 2009 at 10:16:30AM +0000, Martin Kersten wrote:
Update of /cvsroot/monetdb/MonetDB5/src/modules/mal In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6498
Modified Files: Tag: Feb2009 Makefile.ag mal_init.mx Removed Files: Tag: Feb2009 factory.mx Log Message: Solving a name conflict. Factory cannot be used as a module name, because it is a keyword. It should have been captured a long time ago.
Haven't trued to checkout and compile, yet, but I suspect you forgot to check in the new factories.mx, right? Stefan
U Makefile.ag Index: Makefile.ag =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Makefile.ag,v retrieving revision 1.127 retrieving revision 1.127.2.1 diff -u -d -r1.127 -r1.127.2.1 --- Makefile.ag 7 Jan 2009 14:15:13 -0000 1.127 +++ Makefile.ag 8 Feb 2009 10:16:28 -0000 1.127.2.1 @@ -31,7 +31,7 @@ chopper.mx constraints.mx language.mx box.mx \ profiler.mx const.mx algebraExtensions.mx \ inspect.mx manual.mx pqueue.mx mkey.mx \ - factory.mx mdb.mx \ + factories.mx mdb.mx \ urlbox.mx mat.mx \ sabaoth.mx remote.mx replicator.mx txtsim.mx recycle.mx \ cluster.mx @@ -182,7 +182,7 @@ chopper.mx constraints.mx language.mx box.mx \ profiler.mx const.mx algebraExtensions.mx \ inspect.mx manual.mx pqueue.mx mkey.mx \ - factory.mx mdb.mx \ + factories.mx mdb.mx \ urlbox.mx mat.mx \ sabaoth.mx remote.mx replicator.mx batxml.mx recycle.mx \ cluster.mx @@ -198,7 +198,7 @@ profiler.mx const.mx batExtensions.mx algebraExtensions.mx \ inspect.mx manual.mx mal_io.mx pqueue.mx mkey.mx \ chopper.mx clients.mx \ - factory.mx mdb.mx pcre.mx tablet.mx mat.mx \ + factories.mx mdb.mx pcre.mx tablet.mx mat.mx \ urlbox.mx statistics.mx transaction.mx \ mal_mapi.mx sabaoth.mx remote.mx replicator.mx \ bpm.mx batxml.mx txtsim.mx recycle.mx \
U mal_init.mx Index: mal_init.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mal_init.mx,v retrieving revision 1.155 retrieving revision 1.155.2.1 diff -u -d -r1.155 -r1.155.2.1 --- mal_init.mx 26 Jan 2009 09:26:02 -0000 1.155 +++ mal_init.mx 8 Feb 2009 10:16:28 -0000 1.155.2.1 @@ -70,7 +70,7 @@ library clients; library mal_io; library tablet; -library factory; +library factories; library const; library bbp; library box; @@ -160,7 +160,7 @@ include box; include mal_io; include tablet; -include factory; +include factories; include recycle; include remote; include replicator;
--- factory.mx DELETED ---
------------------------------------------------------------------------------ Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |