MonetDB: Feb2013 - Merge with Oct2012 branch.

[Stefan Manegold]

Changeset: d1af1152119f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1af1152119f
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/modules/mal/sample.c
        monetdb5/modules/mal/zorder.c
        monetdb5/optimizer/opt_dictionary.c
Branch: Feb2013
Log Message:

Merge with Oct2012 branch.


diffs (73 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1384,7 +1384,6 @@ str DICTdecompress(int *ret, str *nme);
 str DICTencode(int *ridx, int *val, int *bid);
 str DICTexpand(int *rval, int *val, int *bid);
 str DICTgroupid(int *ret, int *idx, int *val);
-str DICTgroupid(int *ret, int *idx, int *val){ BAT *bi, *bv, *b;
 str DICTinitialize(int *ret);
 str FCTgetArrival(int *ret);
 str FCTgetCaller(int *ret);
@@ -2152,9 +2151,7 @@ str SABmarchScenario(int *ret, str *lang
 str SABprelude(int *ret);
 str SABretreatScenario(int *ret, str *lang);
 str SAMPLEuniform(bat *r, bat *b, ptr s);
-str SAMPLEuniform(bat *r, bat *b, ptr s){ BAT *br, *bb;
 str SAMPLEuniform_dbl(bat *r, bat *b, ptr p);
-str SAMPLEuniform_dbl(bat *r, bat *b, ptr p){ BAT *bb;
 str SEMAcreate(monet_sema *res, int *init);
 str SEMAdestroy(int *res, monet_sema *s);
 str SEMAdown(int *res, monet_sema *s);
@@ -2436,7 +2433,6 @@ str ZORDdecode_int_oid_x(int *x, oid *z)
 str ZORDdecode_int_oid_y(int *y, oid *z);
 str ZORDencode_int_oid(oid *z, int *x, int *y);
 str ZORDslice_int(int *r, int *xb, int *yb, int *xt, int *yt);
-str ZORDslice_int(int *r, int *xb, int *yb, int *xt, int *yt){ BAT *bn;
 void _initTrace(void);
 str abortRef;
 str activateCounter(str name);
diff --git a/monetdb5/modules/mal/sample.c b/monetdb5/modules/mal/sample.c
--- a/monetdb5/modules/mal/sample.c
+++ b/monetdb5/modules/mal/sample.c
@@ -78,7 +78,7 @@
  *
  */
 
-sample_export str
+str
 SAMPLEuniform(bat *r, bat *b, ptr s) {
        BAT *br, *bb;
 
@@ -95,7 +95,7 @@ SAMPLEuniform(bat *r, bat *b, ptr s) {
 
 }
 
-sample_export str
+str
 SAMPLEuniform_dbl(bat *r, bat *b, ptr p) {
        BAT *bb;
        double pr = *(double *)p;
diff --git a/monetdb5/modules/mal/zorder.c b/monetdb5/modules/mal/zorder.c
--- a/monetdb5/modules/mal/zorder.c
+++ b/monetdb5/modules/mal/zorder.c
@@ -387,7 +387,6 @@ ZORDbatdecode_int_oid_y(int *ybid, int *
        return MAL_SUCCEED;
 }
 
-zorder_export 
 str ZORDslice_int(int *r, int *xb, int *yb, int *xt, int *yt)
 {
        BAT *bn;
diff --git a/monetdb5/optimizer/opt_dictionary.c 
b/monetdb5/optimizer/opt_dictionary.c
--- a/monetdb5/optimizer/opt_dictionary.c
+++ b/monetdb5/optimizer/opt_dictionary.c
@@ -883,7 +883,7 @@ str DICTdecompress(int *ret, str *nme)
        return MAL_SUCCEED;
 }
 
-opt_export str DICTgroupid(int *ret, int *idx, int *val)
+str DICTgroupid(int *ret, int *idx, int *val)
 {
        BAT *bi, *bv, *b;
        BATiter bii,bvi;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list