-Fix R_NO_REMAP warning: "R_NO_REMAP" redefined compilation warning (#77)

tylermorganwall · web-flow · commit b1f84409e3b7 · 2024-12-30T13:52:37.000+01:00
* -Fix R_NO_REMAP `warning: "R_NO_REMAP" redefined` compilation warning by adding preprocessor guard

* -Update NEWS

---------

Co-authored-by: tylermorganwall &lt;tylermorganwall@users.noreply.github.com&gt;
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: RcppThread
 Title: R-Friendly Threading in C++
-Version: 2.1.7
+Version: 2.1.8
 Authors@R: c(
     person("Thomas", "Nagler",, "mail@tnagler.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1855-0046"))
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# RcppThread 2.1.8
+
+BUG FIX
+
+* Fixed compilation warning about R_NO_REMAP being defined multiple times (thanks @tylermorganwall)
+
 # RcppThread 2.1.7
 
 BUG FIX
diff --git a/inst/include/RcppThread/RMonitor.hpp b/inst/include/RcppThread/RMonitor.hpp
@@ -7,7 +7,9 @@
 #pragma once
 
 // R API
+#ifndef R_NO_REMAP
 #define R_NO_REMAP
+#endif
 #include "Rinternals.h"
 #include "R.h"
 
diff --git a/src/detectCores.cpp b/src/detectCores.cpp
@@ -1,6 +1,8 @@
 #include <thread>
 
+#ifndef R_NO_REMAP
 #define R_NO_REMAP
+#endif
 
 #include <R.h>
 #include <Rdefines.h>
