From d4327605cb996a41538720e940d512f55d255d25 Mon Sep 17 00:00:00 2001 From: asardaes Date: Mon, 1 Jul 2024 10:36:24 +0200 Subject: [PATCH] Avoid redefining R_NO_REMAP --- src/centroids/R-gateways.h | 1 + src/distances/R-gateways.h | 1 + src/distmat/R-gateways.h | 1 + src/distmat/distmat.h | 1 - src/tadpole/R-gateways.h | 1 + src/utils/R-gateways.h | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/centroids/R-gateways.h b/src/centroids/R-gateways.h index 842bfdac..5384957d 100644 --- a/src/centroids/R-gateways.h +++ b/src/centroids/R-gateways.h @@ -3,6 +3,7 @@ #define R_NO_REMAP #include +#undef R_NO_REMAP namespace dtwclust { diff --git a/src/distances/R-gateways.h b/src/distances/R-gateways.h index 02ece08b..cda7d3ec 100644 --- a/src/distances/R-gateways.h +++ b/src/distances/R-gateways.h @@ -3,6 +3,7 @@ #define R_NO_REMAP #include +#undef R_NO_REMAP namespace dtwclust { diff --git a/src/distmat/R-gateways.h b/src/distmat/R-gateways.h index 58276b74..277c7da4 100644 --- a/src/distmat/R-gateways.h +++ b/src/distmat/R-gateways.h @@ -3,6 +3,7 @@ #define R_NO_REMAP #include +#undef R_NO_REMAP namespace dtwclust { diff --git a/src/distmat/distmat.h b/src/distmat/distmat.h index 8a89881c..10a9533d 100644 --- a/src/distmat/distmat.h +++ b/src/distmat/distmat.h @@ -3,7 +3,6 @@ #include // *_ptr -#define R_NO_REMAP #include #include diff --git a/src/tadpole/R-gateways.h b/src/tadpole/R-gateways.h index 74496a1f..6b1591d9 100644 --- a/src/tadpole/R-gateways.h +++ b/src/tadpole/R-gateways.h @@ -8,6 +8,7 @@ #define R_NO_REMAP #include +#undef R_NO_REMAP namespace dtwclust { diff --git a/src/utils/R-gateways.h b/src/utils/R-gateways.h index aa34dfb6..d76f59e4 100644 --- a/src/utils/R-gateways.h +++ b/src/utils/R-gateways.h @@ -3,6 +3,7 @@ #define R_NO_REMAP #include +#undef R_NO_REMAP namespace dtwclust {