Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 30, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82cf9ad
-Fix R_NO_REMAP `warning: "R_NO_REMAP" redefined` compilation warning…
tylermorganwall Dec 29, 2024
b56f2e5
-Update NEWS
tylermorganwall Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",, "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-1855-0046"))
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions inst/include/RcppThread/RMonitor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
#pragma once

// R API
#ifndef R_NO_REMAP
#define R_NO_REMAP
#endif
#include "Rinternals.h"
#include "R.h"

Expand Down
2 changes: 2 additions & 0 deletions src/detectCores.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include <thread>

#ifndef R_NO_REMAP
#define R_NO_REMAP
#endif

#include <R.h>
#include <Rdefines.h>
Expand Down
Loading