Merge pull request #68 from bgreenwell/devel

rm CXX_STD=CXX11 flag
bgreenwell · May 10, 2023 · 21df738 · 21df738
2 parents 3bcc75f + 5e03ead
commit 21df738
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.Rproj.user/shared/notebooks/paths b/.Rproj.user/shared/notebooks/paths
@@ -1,6 +1,8 @@
 /Users/bgreenwell/.R/Makevars="EEC1896A"
 /Users/bgreenwell/Dropbox/devel/fastshap/.Rbuildignore="B0549DA2"
 /Users/bgreenwell/Dropbox/devel/fastshap/.github/workflows/R-CMD-check.yaml="8B7AA513"
+/Users/bgreenwell/Dropbox/devel/fastshap/.github/workflows/pkgdown.yaml="1EABE082"
+/Users/bgreenwell/Dropbox/devel/fastshap/.gitignore="569FFCA3"
 /Users/bgreenwell/Dropbox/devel/fastshap/DESCRIPTION="300503D2"
 /Users/bgreenwell/Dropbox/devel/fastshap/NAMESPACE="0716B2F8"
 /Users/bgreenwell/Dropbox/devel/fastshap/NEWS.md="708C4D66"
@@ -24,6 +26,8 @@
 /Users/bgreenwell/Dropbox/devel/fastshap/slowtests/fastshap-genOMat.cpp="99FEC81E"
 /Users/bgreenwell/Dropbox/devel/fastshap/slowtests/slowtest-benchmark.R="29ADFB84"
 /Users/bgreenwell/Dropbox/devel/fastshap/slowtests/slowtest-parallel.R="7B058F98"
+/Users/bgreenwell/Dropbox/devel/fastshap/src/Makevars.win="0A0149DE"
+/Users/bgreenwell/Dropbox/devel/fastshap/src/RcppExports.cpp="394C142D"
 /Users/bgreenwell/Dropbox/devel/fastshap/vignettes/fastshap.Rmd="536A2979"
 /Users/bgreenwell/Dropbox/devel/fastshap/vignettes/fastshap.Rmd.orig="EB3E698E"
 /Users/bgreenwell/Dropbox/trees/book.tex="4ECC8BA9"
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,3 +1,2 @@
-CXX_STD = CXX11
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)