Changeset: abbd1459110e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/abbd1459110e
Modified Files:
        monetdb5/mal/mal_pipelines.c
        monetdb5/modules/mal/pp_sort.c
Branch: pp_hashjoin
Log Message:

clang compiler fixes


diffs (23 lines):

diff --git a/monetdb5/mal/mal_pipelines.c b/monetdb5/mal/mal_pipelines.c
--- a/monetdb5/mal/mal_pipelines.c
+++ b/monetdb5/mal/mal_pipelines.c
@@ -225,7 +225,7 @@ PIPELINEworker(void *T)
                                /* only collect one error (from one thread, 
needed for stable testing) */
                                if (ATOMIC_PTR_CAS(&s->error, &null, error)) {
                                        strcpy(s->errbuf, error);
-                                       ATOMIC_PTR_CAS(&s->error, &error, 
s->errbuf);
+                                       ATOMIC_PTR_CAS(&s->error, 
(void**)&error, s->errbuf);
                                }
                        }
                        freeStack(stk);
diff --git a/monetdb5/modules/mal/pp_sort.c b/monetdb5/modules/mal/pp_sort.c
--- a/monetdb5/modules/mal/pp_sort.c
+++ b/monetdb5/modules/mal/pp_sort.c
@@ -216,6 +216,7 @@ PPsubmerge_any( bat *Rzzl, bat *Rzzb, ba
                        p = o;
                }
        }
+       (void)ilen; (void)rlen;
        assert (ilen == rlen && ilen == tsz);
        /*
        printf("sub\n");
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to