portable fix

Author: pachadotdev

inst/include/wrappers/matrices.hpp

@@ -144,9 +144,23 @@ inline doubles_matrix<> as_doubles_matrix(const Mat<double>& A) {
 }
 
 inline integers_matrix<> as_integers_matrix(const Mat<int>& A) {
+  // Fast path: int to int
   return Mat_to_dblint_matrix_<int, integers_matrix<>>(A);
 }
 
+inline integers_matrix<> as_integers_matrix(const Mat<long long>& A) {
+  // Explicit cast for long long to int
+  const int n = A.n_rows;
+  const int m = A.n_cols;
+  writable::integers_matrix<> B(n, m);
+  int* B_data = INTEGER(B);
+  const long long* A_data = A.memptr();
+  for (int i = 0; i < n * m; ++i) {
+    B_data[i] = static_cast<int>(A_data[i]);
+  }
+  return B;
+}
+
 // Convert umat/imat to integers_matrix<>
 
 template <typename T>
@@ -175,17 +189,6 @@ inline integers_matrix<> as_integers_matrix(const umat& A) {
   return as_integers_matrix_template(A);
 }
 
-// Always provide for Mat<int>
-inline integers_matrix<> as_integers_matrix(const Mat<int>& A) {
-  return Mat_to_dblint_matrix_<int, integers_matrix<>>(A);
-}
-// On 64-bit word systems, imat is Mat<long>
-#if defined(ARMA_64BIT_WORD)
-inline integers_matrix<> as_integers_matrix(const Mat<long>& A) {
-  return Mat_to_dblint_matrix_<long, integers_matrix<>>(A);
-}
-#endif
-
 // Complex
 
 template <typename T>

inst/include/wrappers/sparse_matrices.hpp

@@ -131,13 +131,6 @@ inline integers_matrix<> as_integers_matrix(const SpMat<int>& A) {
   return SpMat_to_dblint_matrix_<int, integers_matrix<>>(A);
 }
 
-// On 64-bit word systems, SpMat<sword> is SpMat<long>
-#if defined(ARMA_64BIT_WORD)
-inline integers_matrix<> as_integers_matrix(const SpMat<long>& A) {
-  return SpMat_to_dblint_matrix_<long, integers_matrix<>>(A);
-}
-#endif
-
 inline doubles_matrix<> as_doubles_matrix(const SpMat<float>& A) {
   SpMat<double> B = arma::conv_to<SpMat<double>>::from(A);
   return as_doubles_matrix(B);

inst/include/wrappers/vectors.hpp

@@ -114,9 +114,21 @@ inline U Col_to_dblint_(const Col<T>& x) {
 }
 
 inline integers as_integers(const Col<int>& x) {
+  // Fast path: int to int
   return Col_to_dblint_<int, integers>(x);
 }
 
+inline integers as_integers(const Col<long long>& x) {
+  // Explicit cast for long long to int
+  const size_t n = x.n_elem;
+  writable::integers y(n);
+  const long long* x_data = x.memptr();
+  for (size_t i = 0; i < n; ++i) {
+    y[i] = static_cast<int>(x_data[i]);
+  }
+  return y;
+}
+
 inline doubles as_doubles(const Col<double>& x) {
   return Col_to_dblint_<double, doubles>(x);
 }
@@ -131,13 +143,6 @@ inline integers as_integers(const uvec& x) {
   return y;
 }
 
-// On 64-bit word systems, ivec is Col<long>
-#if defined(ARMA_64BIT_WORD)
-inline integers as_integers(const Col<long>& x) {
-  return Col_to_dblint_<long, integers>(x);
-}
-#endif
-
 inline integers as_integers(const uword& x) {
   writable::integers y(1);