Skip to content

Commit 398846a

Browse files
committed
changed default C++ compiler from C++11 to C++17 as suggested by CRAN
1 parent 6ef99ad commit 398846a

File tree

10 files changed

+20
-18
lines changed

10 files changed

+20
-18
lines changed

.Rproj.user/32B244C4/pcs/files-pane.pper

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"path": "~/Documents/Res/structbreak/MSTest_rpack_v2/MSTest",
2+
"path": "~/Documents/Res/structbreak/MSTest_rpack_v2/MSTest/inst/examples",
33
"sortOrder": [
44
{
55
"columnIndex": 2,
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"activeTab": 2,
2+
"activeTab": -1,
33
"activeTabSourceWindow0": 0
44
}
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"left": {
3-
"splitterpos": 529,
4-
"topwindowstate": "NORMAL",
5-
"panelheight": 1029,
6-
"windowheight": 1067
3+
"splitterpos": 508,
4+
"topwindowstate": "HIDE",
5+
"panelheight": 989,
6+
"windowheight": 1027
77
},
88
"right": {
9-
"splitterpos": 626,
9+
"splitterpos": 601,
1010
"topwindowstate": "NORMAL",
11-
"panelheight": 1029,
12-
"windowheight": 1067
11+
"panelheight": 989,
12+
"windowheight": 1027
1313
}
1414
}

.Rproj.user/32B244C4/persistent-state

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
activeEnvironmentName="R_GlobalEnv"
22
build-last-errors="[]"
33
build-last-errors-base-dir="~/Documents/Res/structbreak/MSTest_rpack_v2/MSTest/"
4-
build-last-outputs="[{\"type\":0,\"output\":\"==> Rcpp::compileAttributes()\\n\\n\"},{\"type\":1,\"output\":\"* Updated R/RcppExports.R\\n\"},{\"type\":1,\"output\":\"\\n\"},{\"type\":0,\"output\":\"==> R CMD INSTALL --preclean --no-multiarch --with-keep.source MSTest\\n\\n\"},{\"type\":1,\"output\":\"* installing to library ‘/Users/grodriguezrondon/Library/R/x86_64/4.2/library’\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"* installing *source* package ‘MSTest’ ...\\n\"},{\"type\":1,\"output\":\"** using staged installation\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** libs\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++11 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Library/Frameworks/R.framework/Versions/4.2/Resources/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c RcppExports.cpp -o RcppExports.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++11 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Library/Frameworks/R.framework/Versions/4.2/Resources/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c methods.cpp -o methods.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++11 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Library/Frameworks/R.framework/Versions/4.2/Resources/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c methods_CHPTest.cpp -o methods_CHPTest.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++11 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Library/Frameworks/R.framework/Versions/4.2/Resources/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c methods_LRTest.cpp -o methods_LRTest.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++11 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Library/Frameworks/R.framework/Versions/4.2/Resources/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c methods_MomentTests.cpp -o methods_MomentTests.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++11 -dynamiclib -Wl,-headerpad_max_install_names -undefined dynamic_lookup -single_module -multiply_defined suppress -L/Library/Frameworks/R.framework/Resources/lib -L/usr/local/lib -o MSTest.so RcppExports.o methods.o methods_CHPTest.o methods_LRTest.o methods_MomentTests.o -L/Library/Frameworks/R.framework/Resources/lib -lRlapack -L/Library/Frameworks/R.framework/Resources/lib -lRblas -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin18/8.2.0 -L/usr/local/gfortran/lib -lgfortran -lquadmath -lm -F/Library/Frameworks/R.framework/.. -framework R -Wl,-framework -Wl,CoreFoundation\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"ld: warning: directory not found for option '-L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin18/8.2.0'\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"installing to /Users/grodriguezrondon/Library/R/x86_64/4.2/library/00LOCK-MSTest/00new/MSTest/libs\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** R\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** data\\n\"},{\"type\":1,\"output\":\"*** moving datasets to lazyload DB\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** inst\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** byte-compile and prepare package for lazy loading\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** help\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"*** installing help indices\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** building package indices\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** testing if installed package can be loaded from temporary location\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** checking absolute paths in shared objects and dynamic libraries\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** testing if installed package can be loaded from final location\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** testing if installed package keeps a record of temporary installation path\\n\"},{\"type\":1,\"output\":\"* DONE (MSTest)\\n\"},{\"type\":1,\"output\":\"\"}]"
4+
build-last-outputs="[{\"type\":0,\"output\":\"==> Rcpp::compileAttributes()\\n\\n\"},{\"type\":1,\"output\":\"* Updated R/RcppExports.R\\n\"},{\"type\":1,\"output\":\"\\n\"},{\"type\":0,\"output\":\"==> R CMD INSTALL --preclean --no-multiarch --with-keep.source MSTest\\n\\n\"},{\"type\":1,\"output\":\"* installing to library ‘/Users/grodriguezrondon/Library/R/x86_64/4.2/library’\\n\"},{\"type\":1,\"output\":\"* installing *source* package ‘MSTest’ ...\\n\"},{\"type\":1,\"output\":\"** using staged installation\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** libs\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++17 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c RcppExports.cpp -o RcppExports.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++17 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c methods.cpp -o methods.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++17 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c methods_CHPTest.cpp -o methods_CHPTest.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++17 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c methods_LRTest.cpp -o methods_LRTest.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++17 -I\\\"/Library/Frameworks/R.framework/Resources/include\\\" -DNDEBUG -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/Rcpp/include' -I'/Users/grodriguezrondon/Library/R/x86_64/4.2/library/RcppArmadillo/include' -I/usr/local/include -fPIC -Wall -g -O2 -c methods_MomentTests.cpp -o methods_MomentTests.o\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"clang++ -mmacosx-version-min=10.13 -std=gnu++17 -dynamiclib -Wl,-headerpad_max_install_names -undefined dynamic_lookup -single_module -multiply_defined suppress -L/Library/Frameworks/R.framework/Resources/lib -L/usr/local/lib -o MSTest.so RcppExports.o methods.o methods_CHPTest.o methods_LRTest.o methods_MomentTests.o -L/Library/Frameworks/R.framework/Resources/lib -lRlapack -L/Library/Frameworks/R.framework/Resources/lib -lRblas -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin18/8.2.0 -L/usr/local/gfortran/lib -lgfortran -lquadmath -lm -F/Library/Frameworks/R.framework/.. -framework R -Wl,-framework -Wl,CoreFoundation\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"ld: warning: directory not found for option '-L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin18/8.2.0'\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"installing to /Users/grodriguezrondon/Library/R/x86_64/4.2/library/00LOCK-MSTest/00new/MSTest/libs\\n\"},{\"type\":1,\"output\":\"** R\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** data\\n\"},{\"type\":1,\"output\":\"*** moving datasets to lazyload DB\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** inst\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** byte-compile and prepare package for lazy loading\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** help\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"*** installing help indices\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** building package indices\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** testing if installed package can be loaded from temporary location\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** checking absolute paths in shared objects and dynamic libraries\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** testing if installed package can be loaded from final location\\n\"},{\"type\":1,\"output\":\"\"},{\"type\":1,\"output\":\"** testing if installed package keeps a record of temporary installation path\\n\"},{\"type\":1,\"output\":\"* DONE (MSTest)\\n\"},{\"type\":1,\"output\":\"\"}]"
55
compile_pdf_state="{\"tab_visible\":false,\"running\":false,\"target_file\":\"\",\"output\":\"\",\"errors\":[]}"
66
files.monitored-path=""
77
find-in-files-state="{\"handle\":\"\",\"input\":\"\",\"path\":\"\",\"regex\":false,\"ignoreCase\":false,\"results\":{\"file\":[],\"line\":[],\"lineValue\":[],\"matchOn\":[],\"matchOff\":[],\"replaceMatchOn\":[],\"replaceMatchOff\":[]},\"running\":false,\"replace\":false,\"preview\":false,\"gitFlag\":false,\"replacePattern\":\"\"}"

.Rproj.user/32B244C4/sources/prop/114FC0AB

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"cursorPosition": "88,10",
33
"scrollLine": "58",
44
"source_window_id": "",
5-
"Source": "Sourceins4wwvcp12i"
5+
"Source": "Source"
66
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"cursorPosition": "7,40",
3-
"scrollLine": "0",
2+
"cursorPosition": "37,25",
3+
"scrollLine": "16",
44
"source_window_id": "",
55
"Source": "Source"
66
}

CRAN-SUBMISSION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Version: 0.1.0
2-
Date: 2022-10-18 14:34:56 UTC
3-
SHA: a64195d5c5ba6000002f2f60f974d0b457a614d6
1+
Version: 0.1.1
2+
Date: 2023-01-31 05:51:25 UTC
3+
SHA: 6ef99ad45828a676a8a25d2ed8fea8c64cf6cff4

DESCRIPTION

+2
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ LinkingTo:
3535
RcppArmadillo
3636
Depends:
3737
R (>= 4.0.0)
38+
SystemRequirements: C++17
39+

src/Makevars

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
##
99
## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP
1010
## support within Armadillo prefers / requires it
11-
CXX_STD = CXX11
11+
CXX_STD = CXX17
1212

1313
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
1414
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

src/Makevars.win

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
##
99
## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP
1010
## support within Armadillo prefers / requires it
11-
CXX_STD = CXX11
11+
CXX_STD = CXX17
1212

1313
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
1414
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

0 commit comments

Comments
 (0)