From 25d456571f2f1e52f1f9aa8ac6bc3a7fcb832e65 Mon Sep 17 00:00:00 2001 From: Tal Galili Date: Sat, 17 Aug 2013 09:37:55 +0300 Subject: [PATCH] Fixed the package! Added missing rows from NAMESPACE (They were removed automatically due to a bug in roxygen2+Rstudio) --- NAMESPACE | 2 ++ NEWS | 13 +++++++++++++ src/RcppExports.cpp | 26 ++++++++++++++++++-------- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index ca75bec..35f53b7 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,2 +1,4 @@ +useDynLib(RcppDend) +exportPattern("^[[:alpha:]]+") export(labels.dendrogram) S3method(labels,dendrogram) diff --git a/NEWS b/NEWS index 389b609..f38baf1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +RcppDend 0.1.1 (2013-08-17) +---------------------------- + +BUG FIXES + * Added missing rows from NAMESPACE (They were removed automatically due to a bug in roxygen2+Rstudio) + +OTHER NOTES: + * Added tests + + + + + RcppDend 0.1.0 (2013-08-16) ---------------------------- diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index f02d38b..04439e7 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -9,19 +9,29 @@ using namespace Rcpp; std::vector Rcpp_labels_dendrogram(List x); RcppExport SEXP RcppDend_Rcpp_labels_dendrogram(SEXP xSEXP) { BEGIN_RCPP - Rcpp::RNGScope __rngScope; - List x = Rcpp::as(xSEXP); - std::vector __result = Rcpp_labels_dendrogram(x); - return Rcpp::wrap(__result); + SEXP __sexp_result; + { + Rcpp::RNGScope __rngScope; + List x = Rcpp::as(xSEXP); + std::vector __result = Rcpp_labels_dendrogram(x); + PROTECT(__sexp_result = Rcpp::wrap(__result)); + } + UNPROTECT(1); + return __sexp_result; END_RCPP } // Rcpp_count_leaves int Rcpp_count_leaves(List data); RcppExport SEXP RcppDend_Rcpp_count_leaves(SEXP dataSEXP) { BEGIN_RCPP - Rcpp::RNGScope __rngScope; - List data = Rcpp::as(dataSEXP); - int __result = Rcpp_count_leaves(data); - return Rcpp::wrap(__result); + SEXP __sexp_result; + { + Rcpp::RNGScope __rngScope; + List data = Rcpp::as(dataSEXP); + int __result = Rcpp_count_leaves(data); + PROTECT(__sexp_result = Rcpp::wrap(__result)); + } + UNPROTECT(1); + return __sexp_result; END_RCPP }