From 799f94958ca01fd19a8f89560b88f31c91c8aa4a Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Mon, 24 Feb 2020 20:28:39 -0800
Subject: [PATCH] util/lmem: minor fixes

---
 .../include/stratosphere/lmem/impl/lmem_impl_common.hpp    | 7 ++++++-
 libraries/libvapours/include/vapours/util/util_uuid.hpp    | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/libstratosphere/include/stratosphere/lmem/impl/lmem_impl_common.hpp b/libraries/libstratosphere/include/stratosphere/lmem/impl/lmem_impl_common.hpp
index 10eb3a69a..11158801f 100644
--- a/libraries/libstratosphere/include/stratosphere/lmem/impl/lmem_impl_common.hpp
+++ b/libraries/libstratosphere/include/stratosphere/lmem/impl/lmem_impl_common.hpp
@@ -78,7 +78,11 @@ namespace ams::lmem::impl {
     struct HeapHead {
         u32 magic;
         util::IntrusiveListNode list_node;
-        typename util::IntrusiveListMemberTraits<&HeapHead::list_node>::ListType child_list;
+
+        using ChildListTraits = util::IntrusiveListMemberTraitsDeferredAssert<&HeapHead::list_node>;
+        using ChildList       = ChildListTraits::ListType;
+        ChildList child_list;
+
         void *heap_start;
         void *heap_end;
         os::Mutex mutex;
@@ -86,5 +90,6 @@ namespace ams::lmem::impl {
         ImplementationHeapHead impl_head;
     };
     static_assert(std::is_trivially_destructible<HeapHead>::value);
+    static_assert(HeapHead::ChildListTraits::IsValid());
 
 }
diff --git a/libraries/libvapours/include/vapours/util/util_uuid.hpp b/libraries/libvapours/include/vapours/util/util_uuid.hpp
index c7ce3ef74..28bca41ce 100644
--- a/libraries/libvapours/include/vapours/util/util_uuid.hpp
+++ b/libraries/libvapours/include/vapours/util/util_uuid.hpp
@@ -38,4 +38,6 @@ namespace ams::util {
         }
     };
 
+    constexpr inline Uuid InvalidUuid = {};
+
 }