1 files changed, 17 insertions, 13 deletions
diff --git a/core/src/Utils/IO/UuidIntegration.hpp b/core/src/Utils/IO/UuidIntegration.hpp
index 9cba4b1..b6ca062 100644
--- a/core/src/Utils/IO/UuidIntegration.hpp
+++ b/core/src/Utils/IO/UuidIntegration.hpp
@@ -1,22 +1,26 @@
 #pragma once
 
-#include <uuid/uuid.h>
+#include "Utils/UUID.hpp"
+
 #include <cstddef>
 #include <cstdint>
 #include <iterator>
 
-namespace DataStreamIntegrations {
-void ReadFromDataStream(DataStream& s, uuids::uuid& uuid)
+namespace DataStreamAdapters {
+struct Uuid
 {
-	uint8_t buffer[16];
-	s.ReadBytes(16, buffer);
+	void ReadFromDataStream(DataStream& s, uuids::uuid& uuid)
+	{
+		uint8_t buffer[16];
+		s.ReadBytes(16, buffer);
 
-	uuid = uuids::uuid(gsl::span<uint8_t, 16>{ buffer });
-}
+		uuid = uuids::uuid(gsl::span<uint8_t, 16>{ buffer });
+	}
 
-void WriteToDataStream(DataStream& s, const uuids::uuid& uuid)
-{
-	auto gslSpan = uuid.as_bytes();
-	s.WriteBytes(gslSpan.size(), gslSpan.data());
-}
-} // namespace DataStreamIntegrations
+	void WriteToDataStream(DataStream& s, const uuids::uuid& uuid)
+	{
+		auto gslSpan = uuid.as_bytes();
+		s.WriteBytes(gslSpan.size(), gslSpan.data());
+	}
+};
+} // namespace DataStreamAdapters