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>
guix/log/gnu/installer/locale.scm'>log</a><a href='/guix/tree/gnu/installer/locale.scm?id=dc5ebbd291bff260cbed010d3d748e3692cba648'>tree</a><a href='/guix/commit/gnu/installer/locale.scm?id=dc5ebbd291bff260cbed010d3d748e3692cba648'>commit</a><a href='/guix/diff/gnu/installer/locale.scm?id=dc5ebbd291bff260cbed010d3d748e3692cba648'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/locale.scm'>
<input type='hidden' name='id' value='dc5ebbd291bff260cbed010d3d748e3692cba648'/><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=dc5ebbd291bff260cbed010d3d748e3692cba648'>root</a>/<a href='/guix/log/gnu?id=dc5ebbd291bff260cbed010d3d748e3692cba648'>gnu</a>/<a href='/guix/log/gnu/installer?id=dc5ebbd291bff260cbed010d3d748e3692cba648'>installer</a>/<a href='/guix/log/gnu/installer/locale.scm?id=dc5ebbd291bff260cbed010d3d748e3692cba648'>locale.scm</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/gnu/installer/locale.scm?id=dc5ebbd291bff260cbed010d3d748e3692cba648&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
lass='left'>Author</th></tr>
<tr><td><span title='2024-10-19 21:45:47 +0900'>2024-10-19</span></td><td><a href='/guix/commit/gnu/services/networking.scm?id=503919fcf01d7eb8d550df5c3993aee9a966ba9b'>services: ntp: Default to an address that supports IPv6.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/networking.scm (%ntp-servers): Replace 0.guix.pool.ntp.org with
2.guix.pool.ntp.org.

Fixes: &lt;https://issues.guix.gnu.org/71462&gt;
Change-Id: I8bf3dc1cec58e7977c5369739b8662f817eeb186
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2024-10-16 19:07:55 +0200'>2024-10-16</span></td><td><a href='/guix/commit/gnu/services/networking.scm?id=f8777ceca52b5c66fba27718b3079ffd303d0680'>Add copyright lines.</a><span class='msg-avail'>...<span class='msg-tooltip'>They are related to commit eb1515849efa3e0d3d838cb04ea87100084068a0.

* doc/guix.texi: Add copyright message.
* gnu/services/networking.scm: Add copyright message.

Change-Id: Ica510fd6e80228f124f0c084403e1dea7c9baa1b
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Nigko Yerden</td></tr>
<tr><td><span title='2024-10-14 14:08:43 +0200'>2024-10-14</span></td><td><a href='/guix/commit/gnu/services/networking.scm?id=eb1515849efa3e0d3d838cb04ea87100084068a0'>services: tor: Add support for pluggable transports.</a><span class='msg-avail'>...<span class='msg-tooltip'>Pluggable transports are programs that disguise Tor traffic, which
can be useful in case Tor is censored.  Pluggable transports
cannot be configured by #:config-file file exclusively because Tor
process is run via 'least-authority-wrapper' and cannot have access
to transport plugin, which is a separate executable (Bug#70302,
Bug#70332).

* doc/guix.texi (Networking Services): Document 'tor-transport-plugin'
data type and 'transport-plugins' option for 'tor-configuration.
* gnu/services/networking.scm: Export
'tor-configuration-transport-plugins', 'tor-transport-plugin',
'tor-transport-plugin?', 'tor-plugin-role',
'tor-plugin-protocol', and 'tor-plugin-program'.
(&lt;tor-configuration&gt;): Add 'transport-plugins' field.
(&lt;tor-transport-plugin&gt;): New variable.
(tor-configuration-&gt;torrc): Add content to 'torrc' computed-file.
(tor-shepherd-service): Add file-system-mapping(s).

Change-Id: I1b0319358778c7aee650bc843e021a6803a1cf3a
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Nigko Yerden</td></tr>
<tr><td><span title='2024-10-07 01:20:21 +0900'>2024-10-07</span></td><td><a href='/guix/commit/gnu/services/networking.scm?id=6954cc6c7a211e24b4e2ec8cd67d880318bd04f8'>services: networking: Add 'version' field to dhcp-client-configuration.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/networking.scm (&lt;dhcp-client-configuration&gt;)
[version]: New field.
(dhcp-client-shepherd-service): Use 'match-record' instead of various
accessors.  Honor the new 'version field'.  Include the version the PID file
name when a non-default version is used.
* doc/guix.texi (Networking Setup) &lt;dhcp-client-configuration&gt;
[version]: Document it.

Change-Id: I6236ae160967c95fe7a2c1785821cc9b0c183e77
</span></span></td><td>Maxim Cournoyer</td></tr>
/td><td>Bruno Victal</td></tr>