moved dimnames access to use cpp methods instead of c macros

mlilback · mlilback · commit 7ab846473eaf · 2017-11-15T13:32:35.000-05:00
diff --git a/src/EnvironmentWatcher.cpp b/src/EnvironmentWatcher.cpp
@@ -484,10 +484,10 @@ RC2::EnvironmentWatcher::setDimNames ( RObject& robj, json& jobj )
 		jobj["dims"] = rvectorToJsonArray(robj);
 	}
 	if (robj.hasAttribute("dimnames")) {
-		RObject mlist(robj.attr("dimnames"));
+		Rcpp::List mlist(robj.attr("dimnames"));
 		json dnames;
-		for (int i=0; i < LENGTH(mlist); i++) {
-			RObject cl(VECTOR_ELT(mlist, i));
+		for (int i=0; i < mlist.length(); i++) {
+			RObject cl(mlist[i]);
 			dnames.push_back(rvectorToJsonArray(cl));
 		}
 		jobj["dimnames"] = dnames;

Original file line number	Diff line number	Diff line change
`@@ -484,10 +484,10 @@ RC2::EnvironmentWatcher::setDimNames ( RObject& robj, json& jobj )`
`484`	`484`	`jobj["dims"] = rvectorToJsonArray(robj);`
`485`	`485`	`}`
`486`	`486`	`if (robj.hasAttribute("dimnames")) {`
`487`		`- RObject mlist(robj.attr("dimnames"));`
	`487`	`+ Rcpp::List mlist(robj.attr("dimnames"));`
`488`	`488`	`json dnames;`
`489`		`- for (int i=0; i < LENGTH(mlist); i++) {`
`490`		`- RObject cl(VECTOR_ELT(mlist, i));`
	`489`	`+ for (int i=0; i < mlist.length(); i++) {`
	`490`	`+ RObject cl(mlist[i]);`
`491`	`491`	`dnames.push_back(rvectorToJsonArray(cl));`
`492`	`492`	`}`
`493`	`493`	`jobj["dimnames"] = dnames;`