From cb9a15eb9d558b2b4b67f9e6806b394f65bff01f Mon Sep 17 00:00:00 2001
From: Dirk Eddelbuettel <edd@debian.org>
Date: Wed, 30 Nov 2022 20:15:42 -0600
Subject: [PATCH] Simplify includes and only include RcppArmadillo.h

---
 inst/include/sgl.h | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/inst/include/sgl.h b/inst/include/sgl.h
index a36011e..869a295 100644
--- a/inst/include/sgl.h
+++ b/inst/include/sgl.h
@@ -21,13 +21,12 @@
 
 #define R_NO_REMAP
 
+//R, Rcpp, RcppArmadillo
+#include <RcppArmadillo.h>
+
 //Progress monitor
 #include <progress.hpp>
 
-//Rcpp ect
-#include <RcppCommon.h>
-#include <Rconfig.h>
-#include <RcppArmadilloConfig.h>
 
 // Debugging
 #ifdef SGL_DEBUG
@@ -45,8 +44,10 @@
 #else
 // Do no debugging
 #define ARMA_NO_DEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 
 // Registration helper macros
 #define STR_VALUE(x) #x
@@ -59,11 +60,6 @@
 
 #define CALL_METHOD(METHOD, MODULE, ARGS) {GET_STR_VALUE(FUN_NAME(METHOD,MODULE)), (DL_FUNC) &r_ ## MODULE ## _ ## METHOD, ARGS}
 
-//Support for xl matrices
-//#define ARMA_64BIT_WORD
-
-#include <armadillo>
-#include <Rcpp.h>
 
 //Boost
 #include <boost/math/special_functions/fpclassify.hpp>
/log/nix/libstore/sqlite.hh'>log</a><a href='/guix/tree/nix/libstore/sqlite.hh?id=2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab'>tree</a><a href='/guix/commit/nix/libstore/sqlite.hh?id=2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab'>commit</a><a href='/guix/diff/nix/libstore/sqlite.hh?id=2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libstore/sqlite.hh'>
<input type='hidden' name='id' value='2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab'>root</a>/<a href='/guix/log/nix?id=2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab'>nix</a>/<a href='/guix/log/nix/libstore?id=2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab'>libstore</a>/<a href='/guix/log/nix/libstore/sqlite.hh?id=2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab'>sqlite.hh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libstore/sqlite.hh?id=2cb678cd04f6a77626b0a7d9ff9cba9ba00bb9ab&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-10-28 22:30:17 +0200'>2016-10-28</span></td><td><a href='/guix/commit/nix/libstore/sqlite.hh?id=b1fd0ab73425e682a0a1404da6963f47a033bb34'>daemon: Improve the SQLite wrapper API.</a><span class='msg-avail'>...<span class='msg-tooltip'>In particular, this eliminates a bunch of boilerplate code.

Also integrates these Nix commits:

  80da7a6 Probably fix SQLITE_BUSY errors
  37a337b throwSQLiteError(): Check for SIGINT so we don't loop forever

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2016-10-28 22:30:17 +0200'>2016-10-28</span></td><td><a href='/guix/commit/nix/libstore/sqlite.hh?id=7bed5d91dea6ecff565d51a021e6f99718d04f86'>daemon: Factor out SQLite handling.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/local-store.cc: Move SQLite code to...
* nix/libstore/sqlite.cc, nix/libstore/sqlite.hh: ... here.  New files.
* nix/local.mk (libstore_a_SOURCES): Add sqlite.cc.
(libstore_headers): Add sqlite.hh.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eelco Dolstra</td></tr>