macro for WIN32

pachadotdev · pachadotdev · commit e9ba91049da6 · 2025-11-08T15:09:37.000-05:00
diff --git a/check-CXX11-clang.log b/check-CXX11-clang.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [4s/25s] NOTE
+* checking CRAN incoming feasibility ... [4s/26s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [40s/41s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [46s/46s] OK
 * used C++ compiler: ‘clang version 20.1.8’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX11-gcc.log b/check-CXX11-gcc.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [4s/17s] NOTE
+* checking CRAN incoming feasibility ... [4s/20s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [67s/67s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [62s/62s] OK
 * used C++ compiler: ‘g++ (GCC) 15.2.1 20250813’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX14-clang.log b/check-CXX14-clang.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [4s/20s] NOTE
+* checking CRAN incoming feasibility ... [3s/15s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [37s/37s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [38s/38s] OK
 * used C++ compiler: ‘clang version 20.1.8’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX14-gcc.log b/check-CXX14-gcc.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [3s/13s] NOTE
+* checking CRAN incoming feasibility ... [4s/18s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [61s/61s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [69s/69s] OK
 * used C++ compiler: ‘g++ (GCC) 15.2.1 20250813’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX17-clang.log b/check-CXX17-clang.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [4s/15s] NOTE
+* checking CRAN incoming feasibility ... [3s/24s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [46s/46s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [33s/33s] OK
 * used C++ compiler: ‘clang version 20.1.8’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX17-gcc.log b/check-CXX17-gcc.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [3s/11s] NOTE
+* checking CRAN incoming feasibility ... [3s/14s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [45s/45s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [54s/54s] OK
 * used C++ compiler: ‘g++ (GCC) 15.2.1 20250813’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX20-clang.log b/check-CXX20-clang.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [3s/25s] NOTE
+* checking CRAN incoming feasibility ... [4s/11s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [33s/33s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [38s/38s] OK
 * used C++ compiler: ‘clang version 20.1.8’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX20-gcc.log b/check-CXX20-gcc.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [3s/22s] NOTE
+* checking CRAN incoming feasibility ... [4s/20s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [52s/53s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [62s/62s] OK
 * used C++ compiler: ‘g++ (GCC) 15.2.1 20250813’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX23-clang.log b/check-CXX23-clang.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [3s/19s] NOTE
+* checking CRAN incoming feasibility ... [5s/23s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [34s/34s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [38s/38s] OK
 * used C++ compiler: ‘clang version 20.1.8’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/check-CXX23-gcc.log b/check-CXX23-gcc.log
@@ -11,7 +11,7 @@ Loading required package: usethis
 * checking for file ‘cpp4rtest/DESCRIPTION’ ... OK
 * this is package ‘cpp4rtest’ version ‘0.1.0’
 * package encoding: UTF-8
-* checking CRAN incoming feasibility ... [4s/19s] NOTE
+* checking CRAN incoming feasibility ... [4s/15s] NOTE
 Maintainer: ‘Mauricio Vargas Sepulveda <m.vargas.sepulveda@gmail.com>’
 
 New submission
@@ -24,7 +24,7 @@ New submission
 * checking for portable file names ... OK
 * checking for sufficient/correct file permissions ... OK
 * checking serialization versions ... OK
-* checking whether package ‘cpp4rtest’ can be installed ... [78s/79s] OK
+* checking whether package ‘cpp4rtest’ can be installed ... [57s/57s] OK
 * used C++ compiler: ‘g++ (GCC) 15.2.1 20250813’
 * checking installed package size ... OK
 * checking package directory ... OK
diff --git a/cpp4rtest/src/test-complex.h b/cpp4rtest/src/test-complex.h
@@ -1,5 +1,15 @@
 #include <testthat.h>
 
+// Helper to initialize Rcomplex portably across compilers
+// Modern compilers prefer {{r,i}} but older Windows MinGW doesn't support it
+#if defined(_WIN32) && defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+  // Old MinGW on Windows - use direct member initialization
+  #define MAKE_RCOMPLEX(r, i) []() { Rcomplex c; c.r = (r); c.i = (i); return c; }()
+#else
+  // Modern compilers - use aggregate initialization
+  #define MAKE_RCOMPLEX(r, i) Rcomplex{{r, i}}
+#endif
+
 context("complexes-C++") {
   test_that("complexes::r_vector(SEXP)") {
     cpp4r::complexes x(Rf_allocVector(CPLXSXP, 2));
@@ -10,14 +20,14 @@ context("complexes-C++") {
 
   test_that("complexes::r_vector::const_iterator()") {
     cpp4r::complexes x(Rf_allocVector(CPLXSXP, 100));
-    COMPLEX(x)[0] = {{1, 1}};
-    COMPLEX(x)[1] = {{2, 2}};
-    COMPLEX(x)[2] = {{3, 3}};
-    COMPLEX(x)[3] = {{4, 4}};
-    COMPLEX(x)[4] = {{5, 5}};
-    COMPLEX(x)[97] = {{98, 98}};
-    COMPLEX(x)[98] = {{99, 99}};
-    COMPLEX(x)[99] = {{100, 100}};
+    COMPLEX(x)[0] = MAKE_RCOMPLEX(1, 1);
+    COMPLEX(x)[1] = MAKE_RCOMPLEX(2, 2);
+    COMPLEX(x)[2] = MAKE_RCOMPLEX(3, 3);
+    COMPLEX(x)[3] = MAKE_RCOMPLEX(4, 4);
+    COMPLEX(x)[4] = MAKE_RCOMPLEX(5, 5);
+    COMPLEX(x)[97] = MAKE_RCOMPLEX(98, 98);
+    COMPLEX(x)[98] = MAKE_RCOMPLEX(99, 99);
+    COMPLEX(x)[99] = MAKE_RCOMPLEX(100, 100);
     expect_true(x.size() == 100);
 
     auto it = x.begin();
@@ -179,13 +189,13 @@ context("complexes-C++") {
   }
 
   test_that("writable::complexes(SEXP)") {
-    Rcomplex one{{1, 1}};
-    Rcomplex two{{2, 2}};
-    Rcomplex three{{3, 3}};
-    Rcomplex four{{4, 4}};
-    Rcomplex five{{5, 5}};
-    Rcomplex six{{6, 6}};
-    Rcomplex seven{{7, 7}};
+    Rcomplex one = MAKE_RCOMPLEX(1, 1);
+    Rcomplex two = MAKE_RCOMPLEX(2, 2);
+    Rcomplex three = MAKE_RCOMPLEX(3, 3);
+    Rcomplex four = MAKE_RCOMPLEX(4, 4);
+    Rcomplex five = MAKE_RCOMPLEX(5, 5);
+    Rcomplex six = MAKE_RCOMPLEX(6, 6);
+    Rcomplex seven = MAKE_RCOMPLEX(7, 7);
 
     SEXP x = PROTECT(Rf_allocVector(CPLXSXP, 5));
 
@@ -217,7 +227,7 @@ context("complexes-C++") {
     UNPROTECT(1);
   }
   test_that("writable::complexes(SEXP, bool)") {
-    Rcomplex five{{5, 5}};
+    Rcomplex five = MAKE_RCOMPLEX(5, 5);
     SEXP x = PROTECT(Rf_ScalarComplex(five));
     cpp4r::writable::complexes y(x, false);
 
@@ -292,8 +302,8 @@ context("complexes-C++") {
 
   test_that("complexes::attr") {
     cpp4r::complexes x(PROTECT(Rf_allocVector(CPLXSXP, 2)));
-    COMPLEX(x)[0] = {{1, 1}};
-    COMPLEX(x)[1] = {{2, 2}};
+    COMPLEX(x)[0] = MAKE_RCOMPLEX(1, 1);
+    COMPLEX(x)[1] = MAKE_RCOMPLEX(2, 2);
 
     SEXP foo = Rf_install("foo");
     Rf_setAttrib(x, foo, Rf_mkString("bar"));
@@ -360,16 +370,16 @@ context("complexes-C++") {
     cpp4r::complexes diff_length(Rf_allocVector(CPLXSXP, 1));
     cpp4r::complexes diff_values(Rf_allocVector(CPLXSXP, 2));
 
-    COMPLEX(base)[0] = {{1, 1}};
-    COMPLEX(base)[1] = {{2, 2}};
+    COMPLEX(base)[0] = MAKE_RCOMPLEX(1, 1);
+    COMPLEX(base)[1] = MAKE_RCOMPLEX(2, 2);
 
-    COMPLEX(same_values)[0] = {{1, 1}};
-    COMPLEX(same_values)[1] = {{2, 2}};
+    COMPLEX(same_values)[0] = MAKE_RCOMPLEX(1, 1);
+    COMPLEX(same_values)[1] = MAKE_RCOMPLEX(2, 2);
 
-    COMPLEX(diff_length)[0] = {{1, 1}};
+    COMPLEX(diff_length)[0] = MAKE_RCOMPLEX(1, 1);
 
-    COMPLEX(diff_values)[0] = {{1, 1}};
-    COMPLEX(diff_values)[1] = {{3, 3}};
+    COMPLEX(diff_values)[0] = MAKE_RCOMPLEX(1, 1);
+    COMPLEX(diff_values)[1] = MAKE_RCOMPLEX(3, 3);
 
     expect_true(base == base);
     expect_true(base == same_values);
@@ -505,3 +515,5 @@ context("complexes-C++") {
     expect_true(Rf_xlength(bar) == 3);
   }
 }
+
+#undef MAKE_RCOMPLEX
diff --git a/cpp4rtest/src/test-r_complex.h b/cpp4rtest/src/test-r_complex.h
@@ -1,5 +1,15 @@
 #include <testthat.h>
 
+// Helper to initialize Rcomplex portably across compilers
+// Modern compilers prefer {{r,i}} but older Windows MinGW doesn't support it
+#if defined(_WIN32) && defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+  // Old MinGW on Windows - use direct member initialization
+  #define MAKE_RCOMPLEX(r, i) []() { Rcomplex c; c.r = (r); c.i = (i); return c; }()
+#else
+  // Modern compilers - use aggregate initialization
+  #define MAKE_RCOMPLEX(r, i) Rcomplex{{r, i}}
+#endif
+
 context("r_complex-C++") {
   test_that("r_complex() zero initialization") {
     // `cpp4r::r_complex x;` is "not initialized", this is "zero initialized"
@@ -26,7 +36,7 @@ context("r_complex-C++") {
   }
 
   test_that("explicit construction from Rcomplex") {
-    Rcomplex x{{1, 2}};
+    Rcomplex x = MAKE_RCOMPLEX(1, 2);
     cpp4r::r_complex y(x);
     expect_true(y.real() == x.r);
     expect_true(y.imag() == x.i);
@@ -88,3 +98,5 @@ context("r_complex-C++") {
     expect_true(COMPLEX(value)[0].i == x.imag());
   }
 }
+
+#undef MAKE_RCOMPLEX
