feat: shared changes

Author: qudix

include/F4SE/F4SE.h

@@ -5,6 +5,5 @@
 #include "F4SE/API.h"
 #include "F4SE/InputMap.h"
 #include "F4SE/Interfaces.h"
-#include "F4SE/Logger.h"
 #include "F4SE/Trampoline.h"
 #include "F4SE/Version.h"

include/F4SE/Impl/PCH.h

@@ -1,23 +1,21 @@
 #pragma once
 
-#include <REX/Impl/PCH.h>
+#include <REL/REL.h>
+#include <REX/REX.h>
 
 namespace F4SE
 {
 	using namespace std::literals;
-	namespace stl = XSE::stl;
 }
 
 namespace RE
 {
 	using namespace std::literals;
-	namespace stl = XSE::stl;
 }
 
 namespace Scaleform
 {
 	using namespace std::literals;
-	namespace stl = XSE::stl;
 }
 
 #include "RE/IDs.h"

include/F4SE/Interfaces.h

@@ -229,7 +229,7 @@ namespace F4SE
 		[[nodiscard]] std::uint32_t Version() const noexcept { return GetProxy().interfaceVersion; }
 
 		bool RegisterListener(EventCallback* a_handler) const { return RegisterListener(a_handler, "F4SE"sv); }
-		bool RegisterListener(EventCallback* a_handler, stl::zstring a_sender) const;
+		bool RegisterListener(EventCallback* a_handler, std::string_view a_sender) const;
 		bool Dispatch(std::uint32_t a_messageType, void* a_data, std::uint32_t a_dataLen, const char* a_receiver) const;
 
 		[[nodiscard]] void* GetEventDispatcher(std::uint32_t a_dispatcherID) const
@@ -256,7 +256,7 @@ namespace F4SE
 
 		[[nodiscard]] std::uint32_t Version() const noexcept { return GetProxy().interfaceVersion; }
 
-		bool Register(stl::zstring a_name, RegisterCallback* a_callback) const;
+		bool Register(std::string_view a_name, RegisterCallback* a_callback) const;
 	};
 
 	class SerializationInterface
@@ -372,7 +372,7 @@ namespace F4SE
 
 		bool Register(RegisterFunctions* a_callback) const;
 
-		void GetExternalEventRegistrations(stl::zstring a_eventName, void* a_data, RegistrantFunctor* a_functor) const
+		void GetExternalEventRegistrations(std::string_view a_eventName, void* a_data, RegistrantFunctor* a_functor) const
 		{
 			GetProxy().GetExternalEventRegistrations(a_eventName.data(), a_data, reinterpret_cast<void*>(a_functor));
 		}

include/F4SE/Logger.h

@@ -16,7 +16,7 @@ namespace RE
 
 			ArmorRatingVisitorBase()
 			{
-				stl::emplace_vtable(this);
+				REX::EMPLACE_VTABLE(this);
 			}
 
 			ArmorRatingVisitorBase(const Actor* a_actor, bool a_checkEquipped)

include/RE/A/ActorUtils.h

@@ -16,7 +16,7 @@ namespace RE
 		class BSTCreatedObjectSmartPointerPolicy
 		{
 		public:
-			static void Acquire(stl::not_null<T*> a_ptr)
+			static void Acquire(T* a_ptr)
 			{
 				const auto manager = BGSCreatedObjectManager::GetSingleton();
 				if (manager &&
@@ -26,7 +26,7 @@ namespace RE
 				}
 			}
 
-			static void Release(stl::not_null<T*> a_ptr)
+			static void Release(T* a_ptr)
 			{
 				const auto manager = BGSCreatedObjectManager::GetSingleton();
 				if (manager &&

include/RE/B/BGSCreatedObjectManager.h

@@ -119,7 +119,7 @@ namespace RE
 				slotIndex(a_slotIndex),
 				attach(a_attach)
 			{
-				stl::emplace_vtable(this);
+				REX::EMPLACE_VTABLE(this);
 				if (success) {
 					*success = true;
 				}
@@ -148,7 +148,7 @@ namespace RE
 			SetHealthFunctor(float a_health) :
 				health(a_health)
 			{
-				stl::emplace_vtable(this);
+				REX::EMPLACE_VTABLE(this);
 			}
 
 			// override (StackDataWriteFunctor)

include/RE/B/BGSInventoryItem.h

@@ -26,7 +26,7 @@ namespace RE
 		BGSObjectInstanceExtra() :
 			BSExtraData(TYPE)
 		{
-			stl::emplace_vtable(this);
+			REX::EMPLACE_VTABLE(this);
 		}
 
 		BGSObjectInstanceExtra(const BGSMod::Template::Item* a_item, TESForm* a_parentForm, const INSTANCE_FILTER* a_filter)

include/RE/B/BGSObjectInstanceExtra.h

@@ -19,7 +19,7 @@ namespace RE
 		BSExtraData(EXTRA_DATA_TYPE a_type) :
 			type(a_type)
 		{
-			stl::emplace_vtable(this);
+			REX::EMPLACE_VTABLE(this);
 		}
 
 		virtual ~BSExtraData() = default;  // 00

include/RE/B/BSExtraData.h

@@ -38,7 +38,7 @@ namespace RE
 		explicit BSFlattenedBoneTree(std::uint32_t a_numChildren) :
 			NiNode(a_numChildren)
 		{
-			stl::emplace_vtable(this);
+			REX::EMPLACE_VTABLE(this);
 		}
 
 		F4_HEAP_REDEFINE_ALIGNED_NEW(BSFlattenedBoneTree);