Update of /cvsroot/monetdb/MonetDB/src/gdk
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12665

Modified Files:
        gdk_rangejoin.mx 
Log Message:
Make compilable when --enable-noexpand=all.


Index: gdk_rangejoin.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_rangejoin.mx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gdk_rangejoin.mx    15 Jan 2008 15:35:35 -0000      1.6
+++ gdk_rangejoin.mx    15 Jan 2008 16:22:49 -0000      1.7
@@ -90,6 +90,8 @@
                @:rangejoin(lng)@
 #endif
        default:
+               (void) li;
+               (void) hi;
                GDKerror("BATrangejoin: type not implemented\n");
                return NULL;
        }
@@ -194,6 +196,10 @@
                @:bandjoin_nl(lng)@
 #endif
        default:
+               (void) c1;
+               (void) c2;
+               (void) li;
+               (void) hi;
                GDKerror("BATbandjoin: type not implemented\n");
                return NULL;
        }
@@ -353,6 +359,13 @@
        case TYPE_lng:
                @:bandjoin_mj_(lng)@
 #endif
+       default:
+               (void) c1;
+               (void) c2;
+               (void) li;
+               (void) hi;
+               GDKerror("BATbandjoin: type not implemented\n");
+               goto failed;
        }
        BATkey(bn, FALSE);
        BATkey(BATmirror(bn), FALSE);
@@ -374,7 +387,7 @@
            ATOMtype(l->htype) != TYPE_oid || ATOMtype(r->ttype) != TYPE_oid)
                return BATbandjoin_nl(l, r, c1, c2, li, hi);
 
-       /* large cases use a merge join like band, therefor we first sort */
+       /* large cases use a merge join like band, therefore we first sort */
        if (!BATtordered(l))
                l = BATmirror(BATsort(BATmirror(l)));
        if (!BAThordered(r))


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to