markmfredrickson / optmatch

Functions for optimal matching in R
https://markmfredrickson.github.io/optmatch
Other
47 stars 14 forks source link

Rcpp code modified automatically #119

Closed josherrickson closed 8 years ago

josherrickson commented 8 years ago

Running check or test (or build or document), R is modifying two files, R/RcppExports.R and src/RcppExports.cpp. Diff log below. It seems harmless (comments modifed and variables renamed), but would prefer @markmfredrickson or @nullsatz to confirm before I check in the changes. I believe I updated Rcpp package recently, so might be related to that, but I don't see anything in Rcpp's changelog.

diff --git a/R/RcppExports.R b/R/RcppExports.R
index c0da17c..c298554 100644
--- a/R/RcppExports.R
+++ b/R/RcppExports.R
@@ -1,4 +1,4 @@
-# This file was generated by Rcpp::compileAttributes
+# Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

 mahalanobisHelper <- function(data, index, invScaleMat) {
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index d1978e3..5aa496b 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -1,4 +1,4 @@
-// This file was generated by Rcpp::compileAttributes
+// Generated by using Rcpp::compileAttributes() -> do not edit by hand
 // Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

 #include <Rcpp.h>
@@ -9,51 +9,51 @@ using namespace Rcpp;
 SEXP mahalanobisHelper(SEXP data, SEXP index, SEXP invScaleMat);
 RcppExport SEXP optmatch_mahalanobisHelper(SEXP dataSEXP, SEXP indexSEXP, SEXP invScaleMatSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< SEXP >::type data(dataSEXP);
     Rcpp::traits::input_parameter< SEXP >::type index(indexSEXP);
     Rcpp::traits::input_parameter< SEXP >::type invScaleMat(invScaleMatSEXP);
-    __result = Rcpp::wrap(mahalanobisHelper(data, index, invScaleMat));
-    return __result;
+    rcpp_result_gen = Rcpp::wrap(mahalanobisHelper(data, index, invScaleMat));
+    return rcpp_result_gen;
 END_RCPP
 }
 // ismOps
 SEXP ismOps(SEXP o, SEXP a, SEXP b);
 RcppExport SEXP optmatch_ismOps(SEXP oSEXP, SEXP aSEXP, SEXP bSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< SEXP >::type o(oSEXP);
     Rcpp::traits::input_parameter< SEXP >::type a(aSEXP);
     Rcpp::traits::input_parameter< SEXP >::type b(bSEXP);
-    __result = Rcpp::wrap(ismOps(o, a, b));
-    return __result;
+    rcpp_result_gen = Rcpp::wrap(ismOps(o, a, b));
+    return rcpp_result_gen;
 END_RCPP
 }
 // r_smahal
 SEXP r_smahal(SEXP index, SEXP data, SEXP z);
 RcppExport SEXP optmatch_r_smahal(SEXP indexSEXP, SEXP dataSEXP, SEXP zSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< SEXP >::type index(indexSEXP);
     Rcpp::traits::input_parameter< SEXP >::type data(dataSEXP);
     Rcpp::traits::input_parameter< SEXP >::type z(zSEXP);
-    __result = Rcpp::wrap(r_smahal(index, data, z));
-    return __result;
+    rcpp_result_gen = Rcpp::wrap(r_smahal(index, data, z));
+    return rcpp_result_gen;
 END_RCPP
 }
 // subsetInfSparseMatrix
 SEXP subsetInfSparseMatrix(SEXP whichRows, SEXP whichCols, SEXP x);
 RcppExport SEXP optmatch_subsetInfSparseMatrix(SEXP whichRowsSEXP, SEXP whichColsSEXP, SEXP xSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< SEXP >::type whichRows(whichRowsSEXP);
     Rcpp::traits::input_parameter< SEXP >::type whichCols(whichColsSEXP);
     Rcpp::traits::input_parameter< SEXP >::type x(xSEXP);
-    __result = Rcpp::wrap(subsetInfSparseMatrix(whichRows, whichCols, x));
-    return __result;
+    rcpp_result_gen = Rcpp::wrap(subsetInfSparseMatrix(whichRows, whichCols, x));
+    return rcpp_result_gen;
 END_RCPP
 }
josherrickson commented 8 years ago

I pushed up these changes as they were irritating my debugging of another issue and still seem innocuous, but leaving this open for second opinion.

nullsatz commented 8 years ago

I agree, the changes look harmless.

On Mon, Oct 10, 2016 at 2:20 PM, Josh Errickson notifications@github.com wrote:

I pushed up these changes as they were irritating my debugging of another issue and still seem innocuous, but leaving this open for second opinion.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/markmfredrickson/optmatch/issues/119#issuecomment-252699648, or mute the thread https://github.com/notifications/unsubscribe-auth/ACvxgn_FYWquJx-2Detc2XW_bfNKu-wWks5qyoHggaJpZM4KM-Pb .

josherrickson commented 8 years ago

Thanks. Closing.