fixes for R 3.3.0

hms-dbmi · Jun 2, 2016 · 2c93f5e · 2c93f5e
1 parent 7e7e79e
commit 2c93f5e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: spp
 Type: Package
 Title: some description
-Version: 1.13
-Date: 2015-08-21
+Version: 1.14
+Date: 2016-06-02
 Author: Peter K
 Depends: caTools
 Imports: Rsamtools

diff --git a/src/bed2vector.cpp b/src/bed2vector.cpp
@@ -17,8 +17,8 @@
 #endif 
 
 extern "C" {
-#include "R.h"
-#include "Rmath.h"
+//#include "R.h"
+//#include "Rmath.h"
 #include "Rinternals.h"
 #include "Rdefines.h"
   // for getline

diff --git a/src/maqread.cpp b/src/maqread.cpp
@@ -12,8 +12,8 @@
 #include <zlib.h>
 
 extern "C" {
-#include "R.h"
-#include "Rmath.h"
+//#include "R.h"
+//#include "Rmath.h"
 #include "Rinternals.h"
 #include "Rdefines.h"
 #include "maqmap.h"

diff --git a/src/peaks.cpp b/src/peaks.cpp
@@ -3,10 +3,12 @@
 #include <iostream>
 #include <string>
 #include <set>
+#include <cmath>
+#include <cstdlib>
 
 extern "C" {
-#include "R.h"
-#include "Rmath.h"
+//#include "R.h"
+//#include "Rmath.h"
 #include "Rinternals.h"
 #include "Rdefines.h"
 }
@@ -108,14 +110,14 @@ extern "C" {
 
     for(int i=0;i<nd;i++) {
       // increment k until pos[k]+size>=d[i]
-      while((abs(pos[k])+size) < d[i]) { k++; if(k==npos) { break; };
+      while((std::abs(pos[k])+size) < d[i]) { k++; if(k==npos) { break; };
 #ifdef DEBUG  
 	Rprintf("advancing k to %d\n",k);
 #endif
       }
       if(k==npos) { break; };
       // increment i until d[i]>=pos[k]-size
-      while((abs(pos[k])-size) > d[i]) { i++; if(i==nd) { break; }
+      while((std::abs(pos[k])-size) > d[i]) { i++; if(i==nd) { break; }
 #ifdef DEBUG  
 	Rprintf("advancing i to %d\n",i);
 #endif
@@ -124,14 +126,14 @@ extern "C" {
 
 
       int l=k;
-      while((l<npos) && ((abs(pos[l])-size) <= d[i])) { l++; 
+      while((l<npos) && ((std::abs(pos[l])-size) <= d[i])) { l++; 
 #ifdef DEBUG  
 	Rprintf("advancing l to %d\n",l);
 #endif
       }
       for(int j=k;j<l;j++) {
-	int pd=d[i]-abs(pos[j]);
-	if(abs(pd)<=size) {
+	int pd=d[i]-std::abs(pos[j]);
+	if(std::abs(pd)<=size) {
 	  // record
 	  if(pos[j]>0) {
 	    x.push_back(pd);
@@ -698,9 +700,9 @@ extern "C" {
       // update flags
       int f=flags[i];
       if(f>0) {
-	s[abs(f)-1]++;
+	s[std::abs(f)-1]++;
       } else {
-	s[abs(f)-1]--;
+	s[std::abs(f)-1]--;
       }
 
       if(max_val!=0 && val[i]*max_val > mval*max_val) { mval=val[i]; }

diff --git a/src/wdl.cpp b/src/wdl.cpp
@@ -3,10 +3,12 @@
 #include <iostream>
 #include <string>
 #include <set>
+#include <cmath>
+#include <cstdlib>
 
 extern "C" {
-#include "R.h"
-#include "Rmath.h"
+//#include "R.h"
+//#include "Rmath.h"
 #include "Rinternals.h"
 #include "Rdefines.h"
 }