[Rcpp-commits] r712 - in pkg/Rcpp: . inst src src/Rcpp/traits

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

Author: romain
Date: 2010-02-17 10:30:05 +0100 (Wed, 17 Feb 2010)
New Revision: 712

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/ChangeLog
   pkg/Rcpp/src/Rcpp.h
   pkg/Rcpp/src/Rcpp/traits/wrap_type_traits.h
   pkg/Rcpp/src/RcppCommon.h
Log:
added support for wrap(float)

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-02-17 01:52:43 UTC (rev 711)
+++ pkg/Rcpp/DESCRIPTION	2010-02-17 09:30:05 UTC (rev 712)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Rcpp R/C++ interface package
-Version: 0.7.7.1
+Version: 0.7.7.2
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek and David Reiss; based on code written during 

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-02-17 01:52:43 UTC (rev 711)
+++ pkg/Rcpp/inst/ChangeLog	2010-02-17 09:30:05 UTC (rev 712)
@@ -1,3 +1,12 @@
+2010-02-17  Romain Francois <romain at r-enthusiasts.com>
+
+	* src/Rcpp/traits/wrap_type_traits: added support for float
+
+	* src/Rcpp/Rcpp.h: now including RObject here instead of in 
+	RcppCommon.h because RObject is a client of implicit converters
+	(attr) and so we need to leave a hook for third party code, e.g.
+	RcppArmadillo
+
 2010-02-16  Dirk Eddelbuettel  <edd at debian.org>
 
 	* R/RcppExample.R, man/RcppExample.Rd: Moved to RcppExamples package

Modified: pkg/Rcpp/src/Rcpp/traits/wrap_type_traits.h
===================================================================
--- pkg/Rcpp/src/Rcpp/traits/wrap_type_traits.h	2010-02-17 01:52:43 UTC (rev 711)
+++ pkg/Rcpp/src/Rcpp/traits/wrap_type_traits.h	2010-02-17 09:30:05 UTC (rev 712)
@@ -58,6 +58,7 @@
 template <> struct wrap_type_traits<bool> { typedef wrap_type_primitive_tag wrap_category; } ;
 template <> struct wrap_type_traits<std::string> { typedef wrap_type_primitive_tag wrap_category; } ;
 template <> struct wrap_type_traits<char> { typedef wrap_type_primitive_tag wrap_category; } ;
+template <> struct wrap_type_traits<float> { typedef wrap_type_primitive_tag wrap_category; } ;
 
 } // namespace traits
 } // namespace Rcpp

Modified: pkg/Rcpp/src/Rcpp.h
===================================================================
--- pkg/Rcpp/src/Rcpp.h	2010-02-17 01:52:43 UTC (rev 711)
+++ pkg/Rcpp/src/Rcpp.h	2010-02-17 09:30:05 UTC (rev 712)
@@ -47,6 +47,8 @@
 
 /* new api */
 
+#include <Rcpp/RObject.h>
+
 #include <Rcpp/clone.h>
 #include <Rcpp/r_cast.h>
 #include <Rcpp/grow.h>

Modified: pkg/Rcpp/src/RcppCommon.h
===================================================================
--- pkg/Rcpp/src/RcppCommon.h	2010-02-17 01:52:43 UTC (rev 711)
+++ pkg/Rcpp/src/RcppCommon.h	2010-02-17 09:30:05 UTC (rev 712)
@@ -173,6 +173,5 @@
 #include <Rcpp/internal/r_vector.h>
 #include <Rcpp/internal/convertible.h>
 #include <Rcpp/internal/wrap.h>
-#include <Rcpp/RObject.h>
 
 #endif