From 6aaca5fd10918d8a560e1a030a8a72d96dd6cab8 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Thu, 16 Sep 2021 22:49:27 +0200
Subject: Added Oid::FromMemory()

---
 zencore/uid.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'zencore/uid.cpp')

diff --git a/zencore/uid.cpp b/zencore/uid.cpp
index acf9f9790..d946638ec 100644
--- a/zencore/uid.cpp
+++ b/zencore/uid.cpp
@@ -83,6 +83,14 @@ Oid::FromHexString(const std::string_view String)
 	}
 }
 
+Oid
+Oid::FromMemory(const void* Ptr)
+{
+	Oid Id;
+	memcpy(Id.OidBits, Ptr, sizeof Id);
+	return Id;
+}
+
 StringBuilderBase&
 Oid::ToString(StringBuilderBase& OutString) const
 {
-- 
cgit v1.2.3


From ed9d27f5e7b2e8eda835e67af302f097e5932366 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Sun, 19 Sep 2021 18:38:31 +0200
Subject: Added GetSessionIdString() which returns a text representation of the
 session id

---
 zencore/uid.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'zencore/uid.cpp')

diff --git a/zencore/uid.cpp b/zencore/uid.cpp
index d946638ec..ed00b1814 100644
--- a/zencore/uid.cpp
+++ b/zencore/uid.cpp
@@ -91,10 +91,16 @@ Oid::FromMemory(const void* Ptr)
 	return Id;
 }
 
+void
+Oid::ToString(char OutString[StringLength])
+{
+	ToHexBytes(reinterpret_cast<const uint8_t*>(OidBits), sizeof(Oid::OidBits), OutString);
+}
+
 StringBuilderBase&
 Oid::ToString(StringBuilderBase& OutString) const
 {
-	char str[25];
+	char str[StringLength + 1];
 	ToHexBytes(reinterpret_cast<const uint8_t*>(OidBits), sizeof(Oid::OidBits), str);
 	str[2 * sizeof(Oid)] = '\0';
 
-- 
cgit v1.2.3


From 8d3024a7e09246e44bf6d9ea14a36e6b03032e85 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Mon, 20 Sep 2021 10:15:12 +0200
Subject: It's not possible to compile out tests

Tests are now compiled in if `ZEN_WITH_TESTS=1`, and compiled out if not. Compiling tests out reduces the footprint of the resulting executables quite significantly.
---
 zencore/uid.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'zencore/uid.cpp')

diff --git a/zencore/uid.cpp b/zencore/uid.cpp
index ed00b1814..d4b708288 100644
--- a/zencore/uid.cpp
+++ b/zencore/uid.cpp
@@ -4,6 +4,7 @@
 
 #include <zencore/endian.h>
 #include <zencore/string.h>
+#include <zencore/testing.h>
 
 #include <atomic>
 #include <bit>
@@ -12,8 +13,6 @@
 #include <set>
 #include <unordered_map>
 
-#include <doctest/doctest.h>
-
 namespace zen {
 
 //////////////////////////////////////////////////////////////////////////
@@ -109,6 +108,8 @@ Oid::ToString(StringBuilderBase& OutString) const
 	return OutString;
 }
 
+#if ZEN_WITH_TESTS
+
 TEST_CASE("Oid")
 {
 	SUBCASE("Basic")
@@ -143,4 +144,6 @@ uid_forcelink()
 {
 }
 
+#endif
+
 }  // namespace zen
-- 
cgit v1.2.3