ams: revamp assertion system

libraries/libvapours/include/vapours/util/util_alignment.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_bitpack.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_bitset.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_bitutil.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_fourcc.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_intrusive_list.hpp

@@ -15,7 +15,9 @@
  */
 
 #pragma once
-#include "util_parent_of_member.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
+#include <vapours/util/util_parent_of_member.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_intrusive_red_black_tree.hpp

@@ -16,7 +16,9 @@
 
 #pragma once
 #include <freebsd/sys/tree.h>
-#include "util_parent_of_member.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
+#include <vapours/util/util_parent_of_member.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_parent_of_member.hpp

@@ -15,8 +15,9 @@
  */
 
 #pragma once
-#include "../defines.hpp"
-#include "util_typed_storage.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
+#include <vapours/util/util_typed_storage.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_scope_guard.hpp

@@ -16,7 +16,8 @@
 
  /* Scope guard logic lovingly taken from Andrei Alexandrescu's "Systemic Error Handling in C++" */
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 
@@ -54,5 +55,5 @@ namespace ams::util {
 
 }
 
-#define SCOPE_GUARD ::ams::util::impl::ScopeGuardOnExit() + [&]() ALWAYS_INLINE_LAMBDA
+#define SCOPE_GUARD   ::ams::util::impl::ScopeGuardOnExit() + [&]() ALWAYS_INLINE_LAMBDA
 #define ON_SCOPE_EXIT auto ANONYMOUS_VARIABLE(SCOPE_EXIT_STATE_) = SCOPE_GUARD

libraries/libvapours/include/vapours/util/util_size.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_specialization_of.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_tinymt.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include <vapours.hpp>
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {
 

libraries/libvapours/include/vapours/util/util_typed_storage.hpp

@@ -15,7 +15,8 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours/common.hpp>
+#include <vapours/assert.hpp>
 
 namespace ams::util {