[Rcpp-commits] r2676 - in pkg/Rcpp: . inst/include src

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

Author: romain
Date: 2010-12-02 21:07:02 +0100 (Thu, 02 Dec 2010)
New Revision: 2676

Removed:
   pkg/Rcpp/inst/include/classic/
   pkg/Rcpp/inst/include/deprecation.h
   pkg/Rcpp/src/deprecated/
Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/include/Rcpp.h
   pkg/Rcpp/inst/include/RcppCommon.h
   pkg/Rcpp/src/RcppCommon.cpp
Log:
remove deprecated api

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-12-02 19:05:58 UTC (rev 2675)
+++ pkg/Rcpp/DESCRIPTION	2010-12-02 20:07:02 UTC (rev 2676)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.8.9.2
+Version: 0.8.9.3
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Douglas Bates, John Chambers, Simon Urbanek, and David Reiss; 

Modified: pkg/Rcpp/inst/include/Rcpp.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp.h	2010-12-02 19:05:58 UTC (rev 2675)
+++ pkg/Rcpp/inst/include/Rcpp.h	2010-12-02 20:07:02 UTC (rev 2676)
@@ -27,11 +27,6 @@
 /* it is important that this comes first */
 #include <RcppCommon.h>
 
-/* classic api */
-#ifndef RCPP_NO_CLASSIC_API
-#include <classic/classic.h>
-#endif
-
 /* new api */
 #include <Rcpp/exceptions.h>
 
@@ -74,8 +69,4 @@
 #include <Rcpp/sugar/sugar.h>
 #include <Rcpp/stats/stats.h>
 
-#ifndef RCPP_NO_CLASSIC_API
-#include <classic/classic_backward.h>
 #endif
-
-#endif

Modified: pkg/Rcpp/inst/include/RcppCommon.h
===================================================================
--- pkg/Rcpp/inst/include/RcppCommon.h	2010-12-02 19:05:58 UTC (rev 2675)
+++ pkg/Rcpp/inst/include/RcppCommon.h	2010-12-02 20:07:02 UTC (rev 2676)
@@ -24,8 +24,6 @@
 #ifndef RcppCommon_h
 #define RcppCommon_h
 
-#include <deprecation.h>
-
 #ifdef __GNUC__
 #define GOOD_COMPILER_FOR_RCPP
 #endif

Deleted: pkg/Rcpp/inst/include/deprecation.h
===================================================================
--- pkg/Rcpp/inst/include/deprecation.h	2010-12-02 19:05:58 UTC (rev 2675)
+++ pkg/Rcpp/inst/include/deprecation.h	2010-12-02 20:07:02 UTC (rev 2676)
@@ -1,28 +0,0 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 4 -*-
-//
-// deprecation.h: Rcpp R/C++ interface class library -- 
-//
-// Copyright (C)2010 Dirk Eddelbuettel and Romain Francois
-//
-// This file is part of Rcpp.
-//
-// Rcpp is free software: you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 2 of the License, or
-// (at your option) any later version.
-//
-// Rcpp is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef deprecation_H
-#define deprecation_H
-
-// uncomment this to not include the deprecated api
-#define RCPP_NO_CLASSIC_API
-
-#endif

Modified: pkg/Rcpp/src/RcppCommon.cpp
===================================================================
--- pkg/Rcpp/src/RcppCommon.cpp	2010-12-02 19:05:58 UTC (rev 2675)
+++ pkg/Rcpp/src/RcppCommon.cpp	2010-12-02 20:07:02 UTC (rev 2676)
@@ -65,11 +65,7 @@
 	LOGICAL(cap)[6] = FALSE ;
 #endif
 
-#ifdef RCPP_NO_CLASSIC_API
 	LOGICAL(cap)[7] = FALSE ;
-#else
-	LOGICAL(cap)[7] = TRUE ;
-#endif
 
 	SET_STRING_ELT(names, 0, Rf_mkChar("variadic templates") ) ;
 	SET_STRING_ELT(names, 1, Rf_mkChar("initializer lists") ) ;