@@ -10,8 +10,8 @@ SEXP lookup(SEXP ux, SEXP xlen, SEXP indices, SEXP gaps, SEXP overlaps, SEXP mul
1010
1111 SEXP vv , tt , lookup , type_lookup ;
1212 R_len_t * idx ,* count ,* type_count ,xrows = INTEGER (xlen )[0 ],uxrows = LENGTH (VECTOR_ELT (ux , 0 )),uxcols = LENGTH (ux );
13- int * from = ( int * ) INTEGER (VECTOR_ELT (indices , 0 ));
14- int * to = ( int * ) INTEGER (VECTOR_ELT (indices , 1 ));
13+ int * from = INTEGER (VECTOR_ELT (indices , 0 ));
14+ int * to = INTEGER (VECTOR_ELT (indices , 1 ));
1515 clock_t pass1 , pass2 , pass3 , start ;
1616 enum {ALL , FIRST , LAST } mult = ALL ;
1717 enum {ANY , WITHIN , START , END , EQUAL } type = ANY ;
@@ -31,8 +31,8 @@ SEXP lookup(SEXP ux, SEXP xlen, SEXP indices, SEXP gaps, SEXP overlaps, SEXP mul
3131 // For reference: uxcols-1 = type_count, uxcols-2 = count, uxcols-3 = type_lookup, uxcols-4 = lookup
3232 // first pass: calculate lengths first
3333 start = clock ();
34- count = ( int * ) INTEGER (VECTOR_ELT (ux , uxcols - 2 ));
35- type_count = ( int * ) INTEGER (VECTOR_ELT (ux , uxcols - 1 ));
34+ count = INTEGER (VECTOR_ELT (ux , uxcols - 2 ));
35+ type_count = INTEGER (VECTOR_ELT (ux , uxcols - 1 ));
3636 switch (mult ) {
3737 case FIRST :
3838 switch (type ) {
@@ -225,10 +225,10 @@ SEXP overlaps(SEXP ux, SEXP imatches, SEXP multArg, SEXP typeArg, SEXP nomatchAr
225225
226226 R_len_t uxcols = LENGTH (ux ),rows = length (VECTOR_ELT (imatches ,0 ));
227227 int nomatch = INTEGER (nomatchArg )[0 ], totlen = 0 , thislen ;
228- int * from = ( int * ) INTEGER (VECTOR_ELT (imatches , 0 ));
229- int * to = ( int * ) INTEGER (VECTOR_ELT (imatches , 1 ));
230- int * count = ( int * ) INTEGER (VECTOR_ELT (ux , uxcols - 2 ));
231- int * type_count = ( int * ) INTEGER (VECTOR_ELT (ux , uxcols - 1 ));
228+ int * from = INTEGER (VECTOR_ELT (imatches , 0 ));
229+ int * to = INTEGER (VECTOR_ELT (imatches , 1 ));
230+ int * count = INTEGER (VECTOR_ELT (ux , uxcols - 2 ));
231+ int * type_count = INTEGER (VECTOR_ELT (ux , uxcols - 1 ));
232232 SEXP lookup = VECTOR_ELT (ux , uxcols - 4 );
233233 SEXP type_lookup = VECTOR_ELT (ux , uxcols - 3 );
234234 SEXP ans , f1__ , f2__ , tmp1 , tmp2 ;
0 commit comments