Changeset: 8212db9b46ed for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8212db9b46ed Modified Files: monetdb5/modules/mosaic/mosaic_join_templates.h Branch: mosaic Log Message:
Testweb compilation fixes. diffs (31 lines): diff --git a/monetdb5/modules/mosaic/mosaic_join_templates.h b/monetdb5/modules/mosaic/mosaic_join_templates.h --- a/monetdb5/modules/mosaic/mosaic_join_templates.h +++ b/monetdb5/modules/mosaic/mosaic_join_templates.h @@ -134,11 +134,10 @@ static inline str MOSjoinWithNilInfo_ID( if( (lci->tpe == cand_dense) && (rci->tpe != cand_dense)){ return MOSouterloopUncompressed_ID(TPE, NIL, NIL_SEMANTICS, canditer_next_dense, canditer_next)(task, l, lci, rci); } - if( (lci->tpe != cand_dense) && (rci->tpe != cand_dense)){ + else { + assert((lci->tpe != cand_dense) && (rci->tpe != cand_dense)); return MOSouterloopUncompressed_ID(TPE, NIL, NIL_SEMANTICS, canditer_next, canditer_next)(task, l, lci, rci); } - - assert(0); } #elif defined MOSjoin_DEFINITION @@ -156,11 +155,10 @@ static str MOSjoin_ID(TPE) (MOStask* tas if( maybe_nil && !nil_matches){ return MOSjoinWithNilInfo_ID(TPE, _maybeHasNil, _nilsDoNotMatch) (task, l, lci); } - if( !maybe_nil && !nil_matches){ + else { + assert (!maybe_nil && !nil_matches); return MOSjoinWithNilInfo_ID(TPE, _hasNoNil, _nilsDoNotMatch) (task, l, lci); } - - return MAL_SUCCEED; } // macro adiministration _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list