fixes for R_NO_REMAP

ahmohamed · Nov 27, 2024 · b2edc85 · b2edc85
1 parent 271cd7a
commit b2edc85
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 158 deletions.
diff --git a/.github/workflows/check-bioc.yml b/.github/workflows/check-bioc.yml
@@ -51,10 +51,10 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, r: 'devel', bioc: '3.20', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
-          - { os: ubuntu-latest, r: '4.4', bioc: '3.19', cont: "bioconductor/bioconductor_docker:RELEASE_3_19", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
-          - { os: macOS-latest, r: '4.4', bioc: '3.19'}
-          - { os: windows-latest, r: '4.4', bioc: '3.19'}
+          - { os: ubuntu-latest, r: 'devel', bioc: '3.21', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
+          - { os: ubuntu-latest, r: '4.4', bioc: '3.20', cont: "bioconductor/bioconductor_docker:RELEASE_3_20", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
+          - { os: macOS-latest, r: '4.4', bioc: '3.20'}
+          - { os: windows-latest, r: '4.4', bioc: '3.20'}
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       RSPM: ${{ matrix.config.rspm }}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: NetPathMiner
-Version: 1.43.0
+Version: 1.43.1
 Date: 2014 onwards
 Title: NetPathMiner for Biological Network Construction, Path Mining
     and Visualization

diff --git a/src/init.h b/src/init.h
@@ -12,6 +12,10 @@
 using namespace std;
 #endif //__cplusplus
 
+#ifndef R_NO_REMAP
+#define R_NO_REMAP
+#endif
+
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>