second pass, slightly less radical

Author: eddelbuettel

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 0.11.4.1.0.1
-Date: 2022-10-11
+Version: 0.11.4.1.0.2
+Date: 2022-10-12
 Author: Dirk Eddelbuettel, Romain Francois, Doug Bates, Binxiang Ni, and Conrad Sanderson
 Maintainer: Dirk Eddelbuettel <[email protected]>
 Description: 'Armadillo' is a templated C++ linear algebra library (by Conrad

inst/include/RcppArmadillo.h

@@ -26,7 +26,7 @@
 #endif
 
 // Set up actual #include <armadillo> after first #include <RcppArmadilloConfig> and more config
-#include <RcppArmadillo_impl/RcppArmadilloForward.h>
+#include <RcppArmadilloForward.h>
 
 // Now automatically include Rcpp as well
 #include <Rcpp.h>

inst/include/RcppArmadillo_impl/RcppArmadillo_bits/Alt_R_RNG.h renamed to inst/include/RcppArmadillo/Alt_R_RNG.h

@@ -0,0 +1,44 @@
+// Emacs, please make this  -*- mode: C++; -*-
+
+// RcppArmadillo: Rcpp/Armadillo glue
+//
+// Copyright (C)  2010 - 2022  Dirk Eddelbuettel, Romain Francois and Douglas Bates
+//
+// This file is part of RcppArmadillo.
+//
+// RcppArmadillo is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// RcppArmadillo is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef RcppArmadillo__RcppArmadillo
+#define RcppArmadillo__RcppArmadillo
+
+#if defined(Rcpp_hpp) && !defined(COMPILING_RCPPARMADILLO)
+    #error "The file 'Rcpp.h' should not be included. Please correct to include only 'RcppArmadillo.h'."
+#endif
+
+// We are undoing a design decision from early on by allowing vectors be returned
+// as standard 'one-dimension' objects -- as opposed to the matrix form we imposed
+#define RCPP_ARMADILLO_RETURN_ANYVEC_AS_VECTOR
+
+// Set up actual #include <armadillo> after first #include <RcppArmadilloConfig> and more config
+#include <RcppArmadilloForward.h>
+
+// Automatically include Rcpp as well -- but only the 'lighter' mode sans modules and rtti
+#include <Rcpp/Lighter>
+
+// Remaining RcppArmadillo code
+#include <RcppArmadillo_impl/RcppArmadilloWrap.h>
+#include <RcppArmadillo_impl/RcppArmadilloAs.h>
+#include <RcppArmadillo_impl/RcppArmadilloSugar.h>
+
+#endif

inst/include/RcppArmadillo/Lighter

@@ -24,7 +24,7 @@
 
 #include <RcppCommon.h>
 #include <Rconfig.h>
-#include <RcppArmadillo_impl/RcppArmadilloConfig.h>
+#include <RcppArmadilloConfig.h>
 
 #define ARMA_EXTRA_MAT_PROTO RcppArmadillo_impl/RcppArmadillo_bits/Mat_proto.h
 #define ARMA_EXTRA_MAT_MEAT  RcppArmadillo_impl/RcppArmadillo_bits/Mat_meat.h
@@ -40,7 +40,7 @@
 // One can use the C++11-based on by commenting out the following
 // #define and also selecting C++11 (eg via src/Makevars* or the
 // DESCRIPTION file) and/or defining #define-ing ARMA_USE_CXX11_RNG
-#define ARMA_RNG_ALT         RcppArmadillo_impl/RcppArmadillo_bits/Alt_R_RNG.h
+#define ARMA_RNG_ALT         RcppArmadillo/Alt_R_RNG.h
 
 // Workaround to mitigate possible interference from a system-level installation of Armadillo
 #define ARMA_DONT_USE_WRAPPER