remove 2 warnings from windows

dankelley · May 25, 2012 · e41b207 · e41b207
1 parent 3b79c20
commit e41b207
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/misc.c b/src/misc.c
@@ -91,7 +91,7 @@ SEXP bisect_d(SEXP x, SEXP find, SEXP side)
                 break;
             }
             /* in left half */
-            if (px[left] <= this_find & (this_find < px[middle])) {
+            if ((px[left] <= this_find) & (this_find < px[middle])) {
 #ifdef debug
                 Rprintf("L %d %d\n", left, middle);
 #endif
@@ -109,7 +109,7 @@ SEXP bisect_d(SEXP x, SEXP find, SEXP side)
                 }
             }
             /* in right half */
-            if (px[middle] < this_find & (this_find <= px[right])) {
+            if ((px[middle] < this_find) & (this_find <= px[right])) {
 #ifdef debug
                 Rprintf("R %d %d %f %f\n", middle, right, px[middle], px[right]);
 #endif

diff --git a/src/trap.c b/src/trap.c
@@ -20,7 +20,7 @@ SEXP trap(SEXP x, SEXP y, SEXP type)
     if ((nx > 1) && nx != ny)
         error("lengths of x (%d) and y (%d) must match", nx, ny);
     double *xp = REAL(x), *yp = REAL(y);
-    double dx;
+    double dx = 1.0;
     if (nx == 1)
         dx = *xp;
     int *typep = INTEGER(type);