fix noRemap issue identified by CRAN

* basically need to switch to using Rf_* functions from C API
jefferislab · Aug 21, 2024 · f85cefc · f85cefc
1 parent 89a3ca4
commit f85cefc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ann2.cpp b/src/ann2.cpp
@@ -5,6 +5,7 @@
 #include <cstring>			// C-style strings
 
 #ifdef RANN
+#define R_NO_REMAP
 #include <R.h>				// R headers for error handling
 #endif
 

diff --git a/src/vendor/ann/ANN.cpp b/src/vendor/ann/ANN.cpp
@@ -30,6 +30,7 @@
 #include <ANN/ANNx.h>					// all ANN includes
 #include <ANN/ANNperf.h>				// ANN performance 
 #ifdef RANN
+#define R_NO_REMAP
 #include <R.h>				// R headers for error handling
 #endif
 
@@ -173,15 +174,15 @@ void annError(const char* msg, ANNerr level)
 {
 	if (level == ANNabort) {
 #ifdef RANN
-		error("RANN: %s",msg);
+		Rf_error("RANN: %s",msg);
 #else
 		cerr << "ANN: ERROR------->" << msg << "<-------------ERROR\n";
 		exit(1);
 #endif
 	}
 	else {
 #ifdef RANN
-		warning("RANN: %s",msg);
+		Rf_warning("RANN: %s",msg);
 #else
 		cerr << "ANN: WARNING----->" << msg << "<-------------WARNING\n";
 #endif