max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

[iphreeqc] More noRemap conversions

Browse Source
This commit is contained in:
Charlton, Scott R 2024-06-10 16:18:29 -06:00
parent a30ab54e6f
commit 5a877d74be
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
R/R.cpp
View File

@ -569,7 +569,7 @@ getSelectedOutputStringsLst(void)
UNPROTECT(1); UNPROTECT(1);
} }
R::singleton().SetCurrentSelectedOutputUserNumber(save); R::singleton().SetCurrentSelectedOutputUserNumber(save);
setAttrib(list, R_NamesSymbol, attr); Rf_setAttrib(list, R_NamesSymbol, attr);
UNPROTECT(2); UNPROTECT(2);
} }
@ -616,18 +616,18 @@ getSelOut(void)
VarClear(&vn); VarClear(&vn);
} }
setAttrib(list, R_NamesSymbol, attr); Rf_setAttrib(list, R_NamesSymbol, attr);
// Turn the data "list" into a "data.frame" // Turn the data "list" into a "data.frame"
// see model.c // see model.c
Rf_protect(klass = mkString("data.frame")); Rf_protect(klass = Rf_mkString("data.frame"));
setAttrib(list, R_ClassSymbol, klass); Rf_setAttrib(list, R_ClassSymbol, klass);
UNPROTECT(1); UNPROTECT(1);
Rf_protect(row_names = Rf_allocVector(INTSXP, rows-1)); Rf_protect(row_names = Rf_allocVector(INTSXP, rows-1));
for (r = 0; r < rows-1; ++r) INTEGER(row_names)[r] = r+1; for (r = 0; r < rows-1; ++r) INTEGER(row_names)[r] = r+1;
setAttrib(list, R_RowNamesSymbol, row_names); Rf_setAttrib(list, R_RowNamesSymbol, row_names);
UNPROTECT(1); UNPROTECT(1);
UNPROTECT(2); UNPROTECT(2);
@ -660,7 +660,7 @@ getSelOutLst(void)
UNPROTECT(1); UNPROTECT(1);
} }
R::singleton().SetCurrentSelectedOutputUserNumber(save); R::singleton().SetCurrentSelectedOutputUserNumber(save);
setAttrib(list, R_NamesSymbol, attr); Rf_setAttrib(list, R_NamesSymbol, attr);
UNPROTECT(2); UNPROTECT(2);
} }