Skip to content

Commit fd067a3

Browse files
committed
Simplify Makevars{,.win} removing comments, minor code cleanup
1 parent c16052e commit fd067a3

File tree

3 files changed

+8
-24
lines changed

3 files changed

+8
-24
lines changed

src/Makevars

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
## -*- mode: makefile; -*-
22

3-
## One could add '-fopenmp' here (and below) for multithreaded operations
43
PKG_CXXFLAGS = -I../inst/include $(SHLIB_OPENMP_CXXFLAGS)
54

6-
## One could add '-fopenmp' here (and above) for multithreaded operations
75
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
8-
9-
## We are not enabling multithreaded operations by default because this would be
10-
## a change in behaviour that would like create trouble for packages using RcppEigen
11-
## as CRAN tests of those packages may seen use of more than two cores and protest

src/Makevars.win

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
## -*- mode: makefile; -*-
22

3-
## One could add '-fopenmp' here (and below) for multithreaded operations
43
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -I../inst/include
54

6-
## One could add '-fopenmp' here (and above) for multithreaded operations
75
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
8-
9-
## We are not enabling multithreaded operations by default because this would be
10-
## a change in behaviour that would like create trouble for packages using RcppEigen
11-
## as CRAN tests of those packages may seen use of more than two cores and protest

src/RcppEigen.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
2-
//
1+
32
// RcppEigen.cpp: Rcpp/Eigen glue
43
//
5-
// Copyright (C) 2011 - 2023 Douglas Bates, Dirk Eddelbuettel and Romain Francois
4+
// Copyright (C) 2011 - 2025 Douglas Bates, Dirk Eddelbuettel and Romain Francois
65
//
76
// This file is part of RcppEigen.
87
//
@@ -23,18 +22,15 @@
2322

2423
// [[Rcpp::export]]
2524
Rcpp::IntegerVector eigen_version(bool single) {
26-
using Rcpp::_;
27-
using Rcpp::IntegerVector;
28-
2925
if (single) {
30-
return Rcpp::wrap( 10000 * EIGEN_WORLD_VERSION +
31-
100 * EIGEN_MAJOR_VERSION +
32-
EIGEN_MINOR_VERSION ) ;
26+
return Rcpp::wrap(10000 * EIGEN_WORLD_VERSION +
27+
100 * EIGEN_MAJOR_VERSION +
28+
EIGEN_MINOR_VERSION) ;
3329
}
3430

35-
return IntegerVector::create(_["major"] = EIGEN_WORLD_VERSION,
36-
_["minor"] = EIGEN_MAJOR_VERSION,
37-
_["patch"] = EIGEN_MINOR_VERSION);
31+
return Rcpp::IntegerVector::create(Rcpp::Named("major") = EIGEN_WORLD_VERSION,
32+
Rcpp::Named("minor") = EIGEN_MAJOR_VERSION,
33+
Rcpp::Named("patch") = EIGEN_MINOR_VERSION);
3834
}
3935

4036
// [[Rcpp::export]]

0 commit comments

Comments
 (0)