chore: update to reflect #157, formatting, collapse another namespace

Starfield-Reverse-Engineering · Oct 11, 2023 · 3b3ad03 · 3b3ad03
1 parent d8ade87
commit 3b3ad03
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/CommonLibSF/include/REL/ID.h b/CommonLibSF/include/REL/ID.h
@@ -78,7 +78,7 @@ namespace REL
 				Offset2ID(std::execution::sequenced_policy{})
 			{}
 
-			[[nodiscard]] constexpr std::uint64_t operator()(std::size_t a_offset) const;
+			[[nodiscard]] std::uint64_t operator()(std::size_t a_offset) const;
 
 			[[nodiscard]] constexpr const_iterator begin() const noexcept { return _offset2id.begin(); }
 

diff --git a/CommonLibSF/include/REL/Version.h b/CommonLibSF/include/REL/Version.h
@@ -149,16 +149,13 @@ namespace REL
 }
 
 #ifdef __cpp_lib_format
-namespace std
+template <class CharT>
+struct std::formatter<REL::Version, CharT> : formatter<std::string, CharT>
 {
-	template <class CharT>
-	struct formatter<REL::Version, CharT> : formatter<std::string, CharT>
+	template <class FormatContext>
+	constexpr auto format(const REL::Version a_version, FormatContext& a_ctx) const
 	{
-		template <class FormatContext>
-		constexpr auto format(const REL::Version a_version, FormatContext& a_ctx) const
-		{
-			return formatter<std::string, CharT>::format(a_version.string(), a_ctx);
-		}
-	};
-}
+		return formatter<std::string, CharT>::format(a_version.string(), a_ctx);
+	}
+};
 #endif
diff --git a/CommonLibSF/src/REL/ID.cpp b/CommonLibSF/src/REL/ID.cpp
@@ -6,7 +6,7 @@ namespace REL
 	{
 		constexpr auto LookUpDir = "Data\\SFSE\\Plugins"sv;
 
-		[[nodiscard]] constexpr std::uint64_t Offset2ID::operator()(std::size_t a_offset) const
+		[[nodiscard]] std::uint64_t Offset2ID::operator()(std::size_t a_offset) const
 		{
 			const mapping_t elem{ 0, a_offset };
 			const auto      it = std::ranges::lower_bound(

diff --git a/CommonLibSF/src/SFSE/API.cpp b/CommonLibSF/src/SFSE/API.cpp
@@ -1,4 +1,5 @@
 #include "SFSE/API.h"
+
 #include "SFSE/Logger.h"
 
 namespace SFSE

diff --git a/CommonLibSF/src/SFSE/Interfaces.cpp b/CommonLibSF/src/SFSE/Interfaces.cpp
@@ -1,4 +1,5 @@
 #include "SFSE/Interfaces.h"
+
 #include "SFSE/API.h"
 #include "SFSE/Logger.h"
 

diff --git a/CommonLibSF/src/SFSE/Logger.cpp b/CommonLibSF/src/SFSE/Logger.cpp
@@ -1,4 +1,5 @@
 #include "SFSE/Logger.h"
+
 #include "SFSE/API.h"
 
 #include <spdlog/sinks/basic_file_sink.h>