From ae8f48026e07b429b1416f5cd35a7fc8e12b2b67 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 17 Dec 2022 16:52:31 -0500
Subject: [PATCH] Another CI fix attempt
---
indra/llcommon/lluuid.h | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index 56ed6437d9e..70e620130bb 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -55,10 +55,13 @@ class LL_COMMON_API LLUUID
// CREATORS
//
LLUUID() = default;
-#if HAVOK_BUILD
- LLUUID(const LLUUID& rhs) { memcpy(mData, rhs.mData, UUID_BYTES); }
+ LLUUID(const LLUUID& rhs) { std::memcpy(mData, rhs.mData, sizeof(mData)); }
+ LLUUID(LLUUID&& rhs) { std::memmove(mData, rhs.mData, sizeof(mData)); }
~LLUUID() {}
-#endif
+
+ LLUUID& operator=(const LLUUID& rhs) { std::memcpy(mData, rhs.mData, sizeof(mData)); return *this;}
+ LLUUID& operator=(LLUUID&& rhs) noexcept { std::memmove(mData, rhs.mData, sizeof(mData)); return *this;}
+
explicit LLUUID(const char *in_string); // Convert from string.
explicit LLUUID(const std::string_view in_string); // Convert from string.
@@ -251,11 +254,6 @@ class LL_COMMON_API LLUUID
U8 mData[UUID_BYTES] = {};
};
-#ifndef HAVOK_BUILD
-static_assert(std::is_trivially_copyable<LLUUID>::value, "LLUUID must be trivial copy");
-static_assert(std::is_trivially_move_assignable<LLUUID>::value, "LLUUID must be trivial move");
-static_assert(std::is_standard_layout<LLUUID>::value, "LLUUID must be a standard layout type");
-#endif
typedef std::vector<LLUUID> uuid_vec_t;
typedef std::set<LLUUID> uuid_set_t;
--
GitLab