From 1cb2d4e5ee1e04111f2861f3fd8802c3a006beb0 Mon Sep 17 00:00:00 2001
From: ArtemisX64 <101918084+ArtemisX64@users.noreply.github.com>
Date: Fri, 26 Aug 2022 21:28:50 +0900
Subject: [PATCH] Proper fix for static asserts (#64)

Replace std::uniform_int_distribution with boost::random::uniform_int_distribution
---
 src/Cafe/Account/Account.cpp | 14 +++++++++-----
 src/Cemu/nex/prudp.cpp       |  5 ++++-
 src/Common/precompiled.h     |  6 ------
 src/util/helpers/helpers.cpp |  7 ++++++-
 vcpkg.json                   |  1 +
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Cafe/Account/Account.cpp b/src/Cafe/Account/Account.cpp
index 0ea74f65..159e6466 100644
--- a/src/Cafe/Account/Account.cpp
+++ b/src/Cafe/Account/Account.cpp
@@ -3,12 +3,13 @@
 #include "gui/CemuApp.h"
 #include "util/helpers/SystemException.h"
 
-#include <random>
-
 #include "config/ActiveSettings.h"
 #include "Cafe/IOSU/legacy/iosu_crypto.h"
 #include "Common/filestream.h"
 
+#include <random>
+#include <boost/random/uniform_int.hpp>
+
 std::vector<Account> Account::s_account_list;
 
 Account::Account(uint32 persistent_id)
@@ -65,8 +66,11 @@ Account::Account(uint32 persistent_id, std::wstring_view mii_name)
 	
 	static std::random_device s_random_device;
 	static std::mt19937 s_mte(s_random_device());
-	std::uniform_int_distribution<uint16> dist(std::numeric_limits<uint8>::min(), std::numeric_limits<uint8>::max());
-	std::generate(m_uuid.begin(), m_uuid.end(), [&]() { return (uint8)dist(s_mte); });
+
+        // use boost library to escape static asserts in linux builds
+        boost::random::uniform_int_distribution<uint16> dist(std::numeric_limits<uint8>::min(), std::numeric_limits<uint8>::max());
+        
+        std::generate(m_uuid.begin(), m_uuid.end(), [&]() { return (uint8)dist(s_mte); });
 
 	// 1000004 or 2000004 | lower uint32 from uuid from uuid
 	m_transferable_id_base = (0x2000004ULL << 32);
@@ -575,4 +579,4 @@ void actPwTest()
 	makePWHash(pwHash, 32, pid, pwHash); // calculates AccountPasswordHash
 
 	assert_dbg();
-}
\ No newline at end of file
+}
diff --git a/src/Cemu/nex/prudp.cpp b/src/Cemu/nex/prudp.cpp
index d3dddda5..7700e5eb 100644
--- a/src/Cemu/nex/prudp.cpp
+++ b/src/Cemu/nex/prudp.cpp
@@ -4,6 +4,8 @@
 #include<bitset>
 #include<random>
 
+#include <boost/random/uniform_int.hpp>
+
 void swap(unsigned char *a, unsigned char *b) 
 {
 	int tmp = *a;
@@ -111,7 +113,8 @@ void releasePRUDPPort(uint16 port)
 }
 
 std::mt19937_64 prudpRG(GetTickCount());
-std::uniform_int_distribution<int> prudpDis8(0, 0xFF);
+// workaround for static asserts when using uniform_int_distribution
+boost::random::uniform_int_distribution<int> prudpDis8(0, 0xFF);
 
 uint8 prudp_generateRandomU8()
 {
diff --git a/src/Common/precompiled.h b/src/Common/precompiled.h
index 4ced91a4..ad080e6e 100644
--- a/src/Common/precompiled.h
+++ b/src/Common/precompiled.h
@@ -1,9 +1,3 @@
-//Temporary Workaround for static_assert related errors in libstdc++12
-//TODO: Make a proper fix
-#ifdef __clang__
-#define static_assert(...) static_assert(true, "")
-#endif
-
 #pragma once
 
 #include <stdlib.h> // for size_t
diff --git a/src/util/helpers/helpers.cpp b/src/util/helpers/helpers.cpp
index 2a076aca..a52aa439 100644
--- a/src/util/helpers/helpers.cpp
+++ b/src/util/helpers/helpers.cpp
@@ -9,6 +9,9 @@
 
 #include "config/ActiveSettings.h"
 
+#include <boost/random/uniform_int.hpp>
+
+
 #if BOOST_OS_WINDOWS
 #include <TlHelp32.h>
 #endif
@@ -427,7 +430,9 @@ std::string GenerateRandomString(const size_t length, const std::string_view cha
 
 	std::random_device rd;
 	std::mt19937 gen(rd());
-	std::uniform_int_distribution<decltype(characters.size())> index_dist(0, characters.size() - 1);
+     
+        // workaround for static asserts using boost
+        boost::random::uniform_int_distribution<decltype(characters.size())> index_dist(0, characters.size() - 1);
 	std::generate_n(
 		result.begin(),
 		length,
diff --git a/vcpkg.json b/vcpkg.json
index 8a5095f5..519a5618 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -29,6 +29,7 @@
     "boost-ptr-container",
     "boost-property-tree",
     "boost-static-string",
+    "boost-random",
     "fmt",
     "glm",
     "glslang",