[Rcpp-commits] r524 - in pkg: . inst src src/Rcpp/internal

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

Author: romain
Date: 2010-01-31 08:28:22 +0100 (Sun, 31 Jan 2010)
New Revision: 524

Modified:
   pkg/DESCRIPTION
   pkg/NEWS
   pkg/inst/ChangeLog
   pkg/src/Rcpp/internal/wrap.h
   pkg/src/RcppCommon.h
Log:
+ wrap( multiset<T> )

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-01-30 20:54:27 UTC (rev 523)
+++ pkg/DESCRIPTION	2010-01-31 07:28:22 UTC (rev 524)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Rcpp R/C++ interface package
-Version: 0.7.4
+Version: 0.7.4.1
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek and David Reiss; based on code written during 

Modified: pkg/NEWS
===================================================================
--- pkg/NEWS	2010-01-30 20:54:27 UTC (rev 523)
+++ pkg/NEWS	2010-01-31 07:28:22 UTC (rev 524)
@@ -1,4 +1,8 @@
 
+0.7.5	(under development
+
+    o	std::multiset<T> becomes wrap<>()'able
+
 0.7.4	2010-01-30
 
     o	matrix matrix-like indexing using operator() for all vector 

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-01-30 20:54:27 UTC (rev 523)
+++ pkg/inst/ChangeLog	2010-01-31 07:28:22 UTC (rev 524)
@@ -1,3 +1,8 @@
+2010-01-31  Romain Francois <francoisromain at free.fr>
+
+	* src/Rcpp/internal/wrap.h: added support for wrap( multiset<T> )
+	where T is wrappable
+
 2010-01-30  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.7.4

Modified: pkg/src/Rcpp/internal/wrap.h
===================================================================
--- pkg/src/Rcpp/internal/wrap.h	2010-01-30 20:54:27 UTC (rev 523)
+++ pkg/src/Rcpp/internal/wrap.h	2010-01-31 07:28:22 UTC (rev 524)
@@ -91,6 +91,7 @@
 template <typename T> struct wrap_type_traits< std::vector<T> > { typedef wrap_type_stl_container_tag category ; } ;
 template <typename T> struct wrap_type_traits< std::set<T> > { typedef wrap_type_stl_container_tag category ; } ;
 template <typename T> struct wrap_type_traits< std::deque<T> > { typedef wrap_type_stl_container_tag category ; } ;
+template <typename T> struct wrap_type_traits< std::multiset<T> > { typedef wrap_type_stl_container_tag category ; } ;
 // #ifdef HAS_INIT_LISTS
 // template <typename T> struct wrap_type_traits< std::initializer_list<T> > { typedef wrap_type_stl_container_tag category ; } ;
 // #endif

Modified: pkg/src/RcppCommon.h
===================================================================
--- pkg/src/RcppCommon.h	2010-01-30 20:54:27 UTC (rev 523)
+++ pkg/src/RcppCommon.h	2010-01-31 07:28:22 UTC (rev 524)
@@ -46,6 +46,7 @@
 #include <stdexcept>
 #include <vector>
 #include <deque>
+#include <multiset>
 #include <functional>
 #include <numeric>
 #include <algorithm>