[Rquantlib-commits] r340 - in pkg/RQuantLib: . R

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

Author: edd
Date: 2014-01-16 04:43:18 +0100 (Thu, 16 Jan 2014)
New Revision: 340

Modified:
   pkg/RQuantLib/ChangeLog
   pkg/RQuantLib/R/inline.R
   pkg/RQuantLib/R/mod.R
Log:
one more '::' instead of ':::' for calling from Rcpp, and not instantiate basic modules for now


Modified: pkg/RQuantLib/ChangeLog
===================================================================
--- pkg/RQuantLib/ChangeLog	2014-01-16 01:40:45 UTC (rev 339)
+++ pkg/RQuantLib/ChangeLog	2014-01-16 03:43:18 UTC (rev 340)
@@ -8,6 +8,7 @@
 	* DESCRIPTION: Update Depends and Imports relationships
 
 	* R/inline.R: Call Rcpp::LdFlags() now that it is exported
+	* R/inline.R: Idem for Rcpp::Rcpp.plugin.maker()
 
 	* man/AsianOption.Rd: Indent to less that 90 columns
 	* man/BinaryOption.Rd: Idem
@@ -17,6 +18,8 @@
 	* man/FixedRateBond.Rd: Idem
 	* man/ImpliedVolatility.Rd: Idem
 
+	* R/mod.R: Do not attempt to load modules for now
+
 2013-05-26  Dirk Eddelbuettel  <edd at debian.org>
 
 	* R/inline.R: Adding a plugin for use by Rcpp attribute or inline

Modified: pkg/RQuantLib/R/inline.R
===================================================================
--- pkg/RQuantLib/R/inline.R	2014-01-16 01:40:45 UTC (rev 339)
+++ pkg/RQuantLib/R/inline.R	2014-01-16 03:43:18 UTC (rev 340)
@@ -48,10 +48,9 @@
 }
 
 inlineCxxPlugin <- function(...) {
-    plugin <-
-        Rcpp:::Rcpp.plugin.maker(include.before = "#include <rquantlib.h>",
-                                 libs = sprintf("%s $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", LdFlags(FALSE)),
-                                 package = "RQuantLib", Makevars = NULL, Makevars.win = NULL)
+    plugin <- Rcpp::Rcpp.plugin.maker(include.before = "#include <rquantlib.h>",
+                                      libs = sprintf("%s $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", LdFlags(FALSE)),
+                                      package = "RQuantLib", Makevars = NULL, Makevars.win = NULL)
     settings <- plugin()
     settings$env$PKG_CPPFLAGS <- CFlags(FALSE)
     settings

Modified: pkg/RQuantLib/R/mod.R
===================================================================
--- pkg/RQuantLib/R/mod.R	2014-01-16 01:40:45 UTC (rev 339)
+++ pkg/RQuantLib/R/mod.R	2014-01-16 03:43:18 UTC (rev 340)
@@ -1,3 +1,3 @@
 
-loadModule("BondsMod", TRUE)
-loadModule("BlackMod", TRUE)
+#loadModule("BondsMod", TRUE)
+#loadModule("BlackMod", TRUE)