[Rcpp-commits] r2645 - pkg/Rcpp/src/deprecated
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Dec 2 09:47:12 CET 2010
Author: romain
Date: 2010-12-02 09:47:11 +0100 (Thu, 02 Dec 2010)
New Revision: 2645
Modified:
pkg/Rcpp/src/deprecated/RcppDate.cpp
pkg/Rcpp/src/deprecated/RcppDateVector.cpp
pkg/Rcpp/src/deprecated/RcppDatetime.cpp
pkg/Rcpp/src/deprecated/RcppDatetimeVector.cpp
pkg/Rcpp/src/deprecated/RcppFrame.cpp
pkg/Rcpp/src/deprecated/RcppFunction.cpp
pkg/Rcpp/src/deprecated/RcppList.cpp
pkg/Rcpp/src/deprecated/RcppNumList.cpp
pkg/Rcpp/src/deprecated/RcppParams.cpp
pkg/Rcpp/src/deprecated/RcppResultSet.cpp
pkg/Rcpp/src/deprecated/RcppStringVector.cpp
pkg/Rcpp/src/deprecated/RcppStringVectorView.cpp
pkg/Rcpp/src/deprecated/copyMessageToR.cpp
Log:
adding deprecation hooks (3)
Modified: pkg/Rcpp/src/deprecated/RcppDate.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppDate.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppDate.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -21,8 +21,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppDate.h>
const int RcppDate::Jan1970Offset = 2440588; // Offset from R date representation to Julian day number.
@@ -137,6 +135,4 @@
day = d;
year = y;
}
-#else
-RCPP_DUMMY(RcppDate)
-#endif
+
Modified: pkg/Rcpp/src/deprecated/RcppDateVector.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppDateVector.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppDateVector.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -21,8 +21,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppDateVector.h>
RcppDateVector::RcppDateVector(SEXP vec) {
@@ -62,6 +60,4 @@
int RcppDateVector::size() const {
return v.size();
}
-#else
-RCPP_DUMMY(RcppDateVector)
-#endif
+
Modified: pkg/Rcpp/src/deprecated/RcppDatetime.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppDatetime.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppDatetime.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -20,8 +20,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppDatetime.h>
#include <time.h> // for strftime
#include <Rmath.h> // for Rf_fround
@@ -72,6 +70,4 @@
tmp.m_parsed = false;
return tmp;
}
-#else
-RCPP_DUMMY(RcppDateTime)
-#endif
+
Modified: pkg/Rcpp/src/deprecated/RcppDatetimeVector.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppDatetimeVector.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppDatetimeVector.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -20,8 +20,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppDatetimeVector.h>
RcppDatetimeVector::RcppDatetimeVector(SEXP vec) {
@@ -57,6 +55,4 @@
int RcppDatetimeVector::size() const {
return v.size();
}
-#else
-RCPP_DUMMY(RcppDateTimeVector)
-#endif
+
Modified: pkg/Rcpp/src/deprecated/RcppFrame.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppFrame.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppFrame.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -20,8 +20,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <Rcpp.h>
ColDatum::ColDatum() : type(COLTYPE_UNKNOWN), level(0) { }
@@ -418,6 +416,3 @@
}
}
-#else
-RCPP_DUMMY(RcppFrame)
-#endif
Modified: pkg/Rcpp/src/deprecated/RcppFunction.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppFunction.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppFunction.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -20,8 +20,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <Rcpp.h>
RcppFunction::RcppFunction(SEXP fn_) : fn(fn_) {
@@ -139,6 +137,4 @@
UNPROTECT(numProtected);
numProtected = 0;
}
-#else
-RCPP_DUMMY(RcppFunction)
-#endif
+
Modified: pkg/Rcpp/src/deprecated/RcppList.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppList.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppList.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -19,8 +19,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppList.h>
RcppList::RcppList(void) : listArg(R_NilValue),
@@ -52,6 +50,3 @@
return li;
}
-#else
-RCPP_DUMMY(RcppList)
-#endif
Modified: pkg/Rcpp/src/deprecated/RcppNumList.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppNumList.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppNumList.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -20,8 +20,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppNumList.h>
RcppNumList::RcppNumList(SEXP theList) {
@@ -60,7 +58,4 @@
int RcppNumList::size() const {
return len;
}
-#else
-RCPP_DUMMY(RcppNumList)
-#endif
Modified: pkg/Rcpp/src/deprecated/RcppParams.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppParams.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppParams.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -20,8 +20,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppParams.h>
RcppParams::RcppParams(SEXP params) {
@@ -183,7 +181,4 @@
}
return RcppDatetime(d);
}
-#else
-RCPP_DUMMY(RcppParams)
-#endif
Modified: pkg/Rcpp/src/deprecated/RcppResultSet.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppResultSet.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppResultSet.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -21,8 +21,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
#include <Rcpp.h>
RcppResultSet::RcppResultSet() : numProtected(0), values() { }
@@ -114,7 +112,4 @@
UNPROTECT(numProtected);
return val;
}
-#else
-RCPP_DUMMY(RcppResultSet)
-#endif
Modified: pkg/Rcpp/src/deprecated/RcppStringVector.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppStringVector.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppStringVector.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -21,7 +21,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppStringVector.h>
RcppStringVector::RcppStringVector(SEXP vec) {
@@ -62,6 +61,4 @@
std::vector<std::string> RcppStringVector::stlVector() const {
return v;
}
-#else
-RCPP_DUMMY(RcppStringVector)
-#endif
+
Modified: pkg/Rcpp/src/deprecated/RcppStringVectorView.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/RcppStringVectorView.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/RcppStringVectorView.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -20,7 +20,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#ifndef RCPP_NO_CLASSIC_API
#include <classic/RcppStringVectorView.h>
RcppStringVectorView::RcppStringVectorView(SEXP vec) {
@@ -47,7 +46,4 @@
int RcppStringVectorView::size() const {
return length;
}
-#else
-RCPP_DUMMY(RcppStringVectorView)
-#endif
Modified: pkg/Rcpp/src/deprecated/copyMessageToR.cpp
===================================================================
--- pkg/Rcpp/src/deprecated/copyMessageToR.cpp 2010-12-02 08:43:43 UTC (rev 2644)
+++ pkg/Rcpp/src/deprecated/copyMessageToR.cpp 2010-12-02 08:47:11 UTC (rev 2645)
@@ -21,9 +21,6 @@
// You should have received a copy of the GNU General Public License
// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
-#include <deprecation.h>
-#ifndef RCPP_NO_CLASSIC_API
-
#include <Rcpp.h>
#include <cstring>
#include <stdio.h>
@@ -41,6 +38,3 @@
return Rmesg;
}
-#else
-RCPP_DUMMY(copyMessageToR)
-#endif
More information about the Rcpp-commits
mailing list