[Rquantlib-commits] r246 - in pkg/RQuantLib: . src

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

Author: edd
Date: 2010-06-13 23:11:42 +0200 (Sun, 13 Jun 2010)
New Revision: 246

Modified:
   pkg/RQuantLib/DESCRIPTION
   pkg/RQuantLib/src/calendars.cpp
Log:
no need for wrap() for calendar objects with proper template specialisation in Rcpp
depend on Rcpp (>= 0.8.2.3) for this


Modified: pkg/RQuantLib/DESCRIPTION
===================================================================
--- pkg/RQuantLib/DESCRIPTION	2010-06-12 18:18:13 UTC (rev 245)
+++ pkg/RQuantLib/DESCRIPTION	2010-06-13 21:11:42 UTC (rev 246)
@@ -24,7 +24,7 @@
  Note that while RQuantLib's code is licensed under the GPL (v2 or later),
  QuantLib itself is released under a somewhat less restrictive Open Source
  license (see QuantLib-License.txt).
-Depends: R (>= 2.7.0), Rcpp (>= 0.8.2.2)
+Depends: R (>= 2.7.0), Rcpp (>= 0.8.2.3)
 LinkingTo: Rcpp
 SystemRequirements: QuantLib library (>= 0.9.9) from http://quantlib.org, 
  Boost library (>= 1.34.0) from http://www.boost.org

Modified: pkg/RQuantLib/src/calendars.cpp
===================================================================
--- pkg/RQuantLib/src/calendars.cpp	2010-06-12 18:18:13 UTC (rev 245)
+++ pkg/RQuantLib/src/calendars.cpp	2010-06-13 21:11:42 UTC (rev 246)
@@ -204,7 +204,7 @@
         }
         delete pcal;
        
-        return Rcpp::List::create(Rcpp::Named("ret") = Rcpp::wrap(dates));
+        return Rcpp::List::create(Rcpp::Named("ret") = dates);
 
     } catch(std::exception &ex) { 
         forward_exception_to_r(ex); 
@@ -233,7 +233,7 @@
         }
         delete pcal;        
 
-        return Rcpp::List::create(Rcpp::Named("ret") = Rcpp::wrap(dates));
+        return Rcpp::List::create(Rcpp::Named("ret") = dates);
 
     } catch(std::exception &ex) { 
         forward_exception_to_r(ex); 
@@ -267,7 +267,7 @@
         }
         delete pcal;        
         
-        return Rcpp::List::create(Rcpp::Named("ret") = Rcpp::wrap(dates));
+        return Rcpp::List::create(Rcpp::Named("ret") = dates);
 
     } catch(std::exception &ex) { 
         forward_exception_to_r(ex); 
@@ -301,7 +301,7 @@
         }
         delete pcal;        
 
-        return Rcpp::List::create(Rcpp::Named("ret") = Rcpp::wrap(dates));
+        return Rcpp::List::create(Rcpp::Named("ret") = dates);
 
     } catch(std::exception &ex) { 
         forward_exception_to_r(ex); 
@@ -336,7 +336,7 @@
         }
         delete pcal;        
         
-        return Rcpp::List::create(Rcpp::Named("ret") = Rcpp::wrap(between));
+        return Rcpp::List::create(Rcpp::Named("ret") = between);
 
     } catch(std::exception &ex) { 
         forward_exception_to_r(ex);