[Rcpp-commits] r4419 - pkg/RcppArmadillo/inst/include

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

Author: edd
Date: 2013-08-03 21:34:49 +0200 (Sat, 03 Aug 2013)
New Revision: 4419

Modified:
   pkg/RcppArmadillo/inst/include/RcppArmadillo.h
   pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
   pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h
   pkg/RcppArmadillo/inst/include/RcppArmadilloSugar.h
   pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h
Log:
standardize emacs and jedit settings header
rolled copyright


Modified: pkg/RcppArmadillo/inst/include/RcppArmadillo.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo.h	2013-08-02 12:15:47 UTC (rev 4418)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo.h	2013-08-03 19:34:49 UTC (rev 4419)
@@ -1,8 +1,9 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+/* :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1: */
 //
 // RcppArmadillo.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010 - 2012  Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010 - 2013  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2013-08-02 12:15:47 UTC (rev 4418)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2013-08-03 19:34:49 UTC (rev 4419)
@@ -1,8 +1,9 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+/* :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1: */
 //
 // RcppArmadilloConfig.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010-2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010 - 2013  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h	2013-08-02 12:15:47 UTC (rev 4418)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h	2013-08-03 19:34:49 UTC (rev 4419)
@@ -1,8 +1,9 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+/* :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1: */
 //
 // RcppArmadilloForward.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010 - 2013  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //
@@ -86,8 +87,8 @@
 	template <typename T> class Exporter< arma::Mat<T> > ;
 	template <typename T> class Exporter< arma::Row<T> > ;
 	template <typename T> class Exporter< arma::Col<T> > ;
-// template <typename T> class Exporter< arma::field<T> > ;
-// template <typename T> class Exporter< arma::Cube<T> > ;
+        // template <typename T> class Exporter< arma::field<T> > ;
+        // template <typename T> class Exporter< arma::Cube<T> > ;
 
     } // namespace traits 
 

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloSugar.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloSugar.h	2013-08-02 12:15:47 UTC (rev 4418)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloSugar.h	2013-08-03 19:34:49 UTC (rev 4419)
@@ -1,8 +1,9 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+/* :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1: */
 //
 // RcppArmadilloSugar.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010-2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010 - 2013  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h	2013-08-02 12:15:47 UTC (rev 4418)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h	2013-08-03 19:34:49 UTC (rev 4419)
@@ -1,8 +1,9 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 4 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+/* :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1: */
 //
 // RcppArmadilloWrap.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010-2012 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010 - 2013  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //
@@ -33,6 +34,15 @@
 	    return x; 
 	}
 
+	// DE 03-Aug-2013
+	// here is an alternate form which would not set dimension which we could do
+	// for row and column vectors -- but the current form of return row and col
+    // as matrix types with one col (or row, respectively) is now entrenched
+	template <typename T>
+	SEXP arma_wrap(const T& object) {
+	    return ::Rcpp::wrap(object.memptr() , object.memptr() + object.n_elem);
+	}
+
     } /* namespace RcppArmadillo */
 	
     /* wrap */