From 9d50a878dca6bf3af2a2bf7c1be03913ef2e5ce6 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 8 Nov 2023 18:48:31 +0100
Subject: [PATCH] Inline variables to have compiler reuse them

Unfortunately, this requires at least C++17, but the inline is exactly
what we need to avoid redundant copies of static const data.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 include/stdex/base64.hpp       | 4 ++--
 include/stdex/sgml_unicode.hpp | 4 ++--
 include/stdex/sys_info.hpp     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/stdex/base64.hpp b/include/stdex/base64.hpp
index 4f020e7dc..66f0bae1a 100644
--- a/include/stdex/base64.hpp
+++ b/include/stdex/base64.hpp
@@ -15,14 +15,14 @@
 namespace stdex
 {
 	/// \cond internal
-	const char base64_enc_lookup[64] = {
+	inline const char base64_enc_lookup[64] = {
 		'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
 		'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
 		'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
 		'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
 	};
 
-	const uint8_t base64_dec_lookup[256] = {
+	inline const uint8_t base64_dec_lookup[256] = {
 	/*           0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F  */
 	/* 0 */    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 	/* 1 */    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
diff --git a/include/stdex/sgml_unicode.hpp b/include/stdex/sgml_unicode.hpp
index cf7619f1c..f976743ac 100644
--- a/include/stdex/sgml_unicode.hpp
+++ b/include/stdex/sgml_unicode.hpp
@@ -13,7 +13,7 @@ namespace stdex
 		wchar_t unicode[3]; ///< Unicode string representation
 	};
 
-	const sgml_unicode_pair sgml_unicode[] = {
+	inline const sgml_unicode_pair sgml_unicode[] = {
 		{ "AElig", L"\u00c6" },
 		{ "Aacgr", L"\u0386" },
 		{ "Aacute", L"\u00c1" },
@@ -1551,7 +1551,7 @@ namespace stdex
 		{ "zwnj", L"\u200c" },
 	};
 
-	const size_t unicode_sgml[] = {
+	inline const size_t unicode_sgml[] = {
 		0x5b6,
 		0x48d,
 		0x30d,
diff --git a/include/stdex/sys_info.hpp b/include/stdex/sys_info.hpp
index 3ae9736b2..194ede03b 100644
--- a/include/stdex/sys_info.hpp
+++ b/include/stdex/sys_info.hpp
@@ -48,7 +48,7 @@ namespace stdex
 	///
 	/// System information
 	///
-	const struct sys_info_t
+	inline const struct sys_info_t
 	{
 		///
 		/// The platform this process was compiled for