Skip to content
Snippets Groups Projects
Commit ae8f4802 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Another CI fix attempt

parent 31b6f82d
No related branches found
No related tags found
No related merge requests found
...@@ -55,10 +55,13 @@ class LL_COMMON_API LLUUID ...@@ -55,10 +55,13 @@ class LL_COMMON_API LLUUID
// CREATORS // CREATORS
// //
LLUUID() = default; LLUUID() = default;
#if HAVOK_BUILD LLUUID(const LLUUID& rhs) { std::memcpy(mData, rhs.mData, sizeof(mData)); }
LLUUID(const LLUUID& rhs) { memcpy(mData, rhs.mData, UUID_BYTES); } LLUUID(LLUUID&& rhs) { std::memmove(mData, rhs.mData, sizeof(mData)); }
~LLUUID() {} ~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 char *in_string); // Convert from string.
explicit LLUUID(const std::string_view 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 ...@@ -251,11 +254,6 @@ class LL_COMMON_API LLUUID
U8 mData[UUID_BYTES] = {}; 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::vector<LLUUID> uuid_vec_t;
typedef std::set<LLUUID> uuid_set_t; typedef std::set<LLUUID> uuid_set_t;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment