diff --git a/cran-comments.md b/cran-comments.md index 8fefb7d..cffce45 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -17,4 +17,5 @@ i.e. gmvjoint.so has size 8.3Mb. R-hub build OK. Note upon installation one may be warned about inconsistencies across TMB/Matrix versions, but this is not within my control. -Some warning about C++11 flags also, but this comes from RcppArmadillo, and not sure I can relax this. \ No newline at end of file +Commented warnings about CXX_STD=CXX11 in Makevars(/.win) which resulted in a NOTE. Hopefully this doesn't result +in deterioration of performance since I thought RcppArmadillo required this! \ No newline at end of file diff --git a/src/Makevars b/src/Makevars index d3e3f41..a04cb2c 100644 --- a/src/Makevars +++ b/src/Makevars @@ -8,7 +8,7 @@ ## ## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP ## support within Armadillo prefers / requires it -CXX_STD = CXX11 +##CXX_STD = CXX11 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/src/Makevars.win b/src/Makevars.win index d3e3f41..a04cb2c 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -8,7 +8,7 @@ ## ## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP ## support within Armadillo prefers / requires it -CXX_STD = CXX11 +##CXX_STD = CXX11 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)