MonetDB: default - Merge with Jan2014 branch.

[Sjoerd Mullender]

Changeset: 8f16a995dba4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f16a995dba4
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/modules/mal/sample.c
        monetdb5/modules/mal/sample.h
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (75 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
@@ -1837,8 +1837,8 @@ str SABmarchConnection(int *ret, str *ho
 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_dbl(bat *r, bat *b, ptr p);
+str SAMPLEuniform(bat *r, bat *b, wrd *s);
+str SAMPLEuniform_dbl(bat *r, bat *b, dbl *p);
 str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str SERVERclient(int *res, stream **In, stream **Out);
 str SERVERconnect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc);
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
@@ -79,13 +79,13 @@
  */
 
 str
-SAMPLEuniform(bat *r, bat *b, ptr s) {
+SAMPLEuniform(bat *r, bat *b, wrd *s) {
        BAT *br, *bb;
 
        if ((bb = BATdescriptor(*b)) == NULL) {
                throw(MAL, "sample.subuniform", INTERNAL_BAT_ACCESS);
        }
-       br = BATsample(bb,*(BUN *)s);
+       br = BATsample(bb, (BUN) *s);
        if (br == NULL)
                throw(MAL, "sample.subuniform", OPERATION_FAILED);
 
@@ -96,9 +96,9 @@ SAMPLEuniform(bat *r, bat *b, ptr s) {
 }
 
 str
-SAMPLEuniform_dbl(bat *r, bat *b, ptr p) {
+SAMPLEuniform_dbl(bat *r, bat *b, dbl *p) {
        BAT *bb;
-       double pr = *(double *)p;
+       double pr = *p;
        wrd s;
 
        if ( pr < 0.0 || pr > 1.0 ) {
@@ -106,12 +106,12 @@ SAMPLEuniform_dbl(bat *r, bat *b, ptr p)
                                " p should be between 0 and 1.0" );
        } else if (pr == 0) {/* special case */
                s = 0;
-               return SAMPLEuniform(r, b, (ptr)&s);
+               return SAMPLEuniform(r, b, &s);
        }
        if ((bb = BATdescriptor(*b)) == NULL) {
                throw(MAL, "sample.uniform", INTERNAL_BAT_ACCESS);
        }
        s = (wrd) (pr*(double)BATcount(bb));
        BBPunfix(bb->batCacheid);
-       return SAMPLEuniform(r, b, (ptr) &s);
+       return SAMPLEuniform(r, b, &s);
 }
diff --git a/monetdb5/modules/mal/sample.h b/monetdb5/modules/mal/sample.h
--- a/monetdb5/modules/mal/sample.h
+++ b/monetdb5/modules/mal/sample.h
@@ -39,9 +39,9 @@
 #endif
 
 sample_export str
-SAMPLEuniform(bat *r, bat *b, ptr s);
+SAMPLEuniform(bat *r, bat *b, wrd *s);
 
 sample_export str
-SAMPLEuniform_dbl(bat *r, bat *b, ptr p);
+SAMPLEuniform_dbl(bat *r, bat *b, dbl *p);
 
 #endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list