[Rcpp-commits] r427 - in pkg: inst src

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-01-22 16:01:58 +0100 (Fri, 22 Jan 2010)
New Revision: 427

Modified:
   pkg/inst/ChangeLog
   pkg/src/RcppFrame.cpp
   pkg/src/RcppFunction.cpp
   pkg/src/RcppFunction.h
Log:
listen to some suncc complaints

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-01-22 14:51:11 UTC (rev 426)
+++ pkg/inst/ChangeLog	2010-01-22 15:01:58 UTC (rev 427)
@@ -13,6 +13,10 @@
 
 	* src/Environment.cpp: use Evaluator instead of R_ToplevelExec
 
+	* src/RcppFunction.{h,cpp}: listen to some suncc warnings
+
+	* src/RcppFrame.cpp: listen to some suncc warnings
+
 2010-01-21  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.7.3

Modified: pkg/src/RcppFrame.cpp
===================================================================
--- pkg/src/RcppFrame.cpp	2010-01-22 14:51:11 UTC (rev 426)
+++ pkg/src/RcppFrame.cpp	2010-01-22 15:01:58 UTC (rev 427)
@@ -35,8 +35,8 @@
     d = datum.d;
     if (type == COLTYPE_FACTOR) {
 	levelNames = new std::string[numLevels];
-	for (int i = 0; i < numLevels; i++)
-	    levelNames[i] = datum.levelNames[i];
+	for (int j = 0; j < numLevels; j++)
+	    levelNames[j] = datum.levelNames[j];
     }
 }
 
@@ -89,8 +89,8 @@
     level = factorLevel;
     numLevels = numNames;
     levelNames = new std::string[numLevels];
-    for (int i = 0; i < numLevels; i++)
-	levelNames[i] = names[i];
+    for (int j = 0; j < numLevels; j++)
+	levelNames[j] = names[j];
     type = COLTYPE_FACTOR;
 }
 
@@ -159,7 +159,7 @@
     return levelNames[level-1];
 }
 
-RcppFrame::RcppFrame(std::vector<std::string> colNames) : colNames(colNames) {
+RcppFrame::RcppFrame(std::vector<std::string> colNames_) : colNames(colNames_) {
     if (colNames.size() == 0)
 	throw std::range_error("RcppFrame::RcppFrame: zero length colNames");
 }

Modified: pkg/src/RcppFunction.cpp
===================================================================
--- pkg/src/RcppFunction.cpp	2010-01-22 14:51:11 UTC (rev 426)
+++ pkg/src/RcppFunction.cpp	2010-01-22 15:01:58 UTC (rev 427)
@@ -22,7 +22,7 @@
 
 #include <RcppFunction.h>
 
-RcppFunction::RcppFunction(SEXP fn) : fn(fn) { 
+RcppFunction::RcppFunction(SEXP fn_) : fn(fn_) { 
     if (!Rf_isFunction(fn))
 	throw std::range_error("RcppFunction: non-function where function expected");
     numProtected = 0;

Modified: pkg/src/RcppFunction.h
===================================================================
--- pkg/src/RcppFunction.h	2010-01-22 14:51:11 UTC (rev 426)
+++ pkg/src/RcppFunction.h	2010-01-22 15:01:58 UTC (rev 427)
@@ -29,7 +29,7 @@
 
 class RcppFunction {
 public:
-    RcppFunction(SEXP fn);
+    RcppFunction(SEXP fn_);
     ~RcppFunction();
     SEXP listCall();
     SEXP vectorCall();