feat: remove stl::to_underlying, use std::to_underlying

Starfield-Reverse-Engineering · Sep 22, 2024 · ec59b6f · ec59b6f
1 parent eff49e2
commit ec59b6f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/include/RE/B/BGSDefaultObjectManager.h b/include/RE/B/BGSDefaultObjectManager.h
@@ -428,7 +428,7 @@ namespace RE
 		[[nodiscard]] TESForm* GetDefaultObject(DEFAULT_OBJECT a_obj) const noexcept
 		{
 			assert(a_obj < DEFAULT_OBJECT::kTotal);
-			return objectArray[stl::to_underlying(a_obj)];
+			return objectArray[std::to_underlying(a_obj)];
 		}
 
 		template <class T>

diff --git a/include/RE/T/TESDataHandler.h b/include/RE/T/TESDataHandler.h
@@ -54,7 +54,7 @@ namespace RE
 		std::uint64_t          unk0058;                                           // 0058
 		std::uint64_t          unk0060;                                           // 0060
 		std::uint64_t          unk0068;                                           // 0068
-		FormArray              formArrays[stl::to_underlying(FormType::kTotal)];  // 0070
+		FormArray              formArrays[std::to_underlying(FormType::kTotal)];  // 0070
 		TESRegionList*         regionList;                                        // 1498
 		std::uint64_t          unk14A0;                                           // 14A0
 		std::uint64_t          unk14A8;                                           // 14A8

diff --git a/include/SFSE/Impl/PCH.h b/include/SFSE/Impl/PCH.h
@@ -481,13 +481,6 @@ namespace SFSE::stl
 		std::unreachable();
 	}
 
-	template <class Enum>
-	[[nodiscard]] constexpr auto to_underlying(Enum a_val) noexcept
-		requires(std::is_enum_v<Enum>)
-	{
-		return static_cast<std::underlying_type_t<Enum>>(a_val);
-	}
-
 	template <class To, class From>
 	[[nodiscard]] To unrestricted_cast(From a_from) noexcept
 	{

diff --git a/src/RE/F/FormTypes.cpp b/src/RE/F/FormTypes.cpp
@@ -6,7 +6,7 @@ namespace RE
 {
 	const char* FormTypeToString(FormType a_formType)
 	{
-		return FORM_ENUM_STRING::GetFormEnumString()[stl::to_underlying(a_formType)].formString;
+		return FORM_ENUM_STRING::GetFormEnumString()[std::to_underlying(a_formType)].formString;
 	}
 
 	FormType StringToFormType(std::string_view a_formType)