revert previous commits

TAPZCREW · Feb 9, 2024 · 7092349 · 7092349
1 parent 90d6ce3
commit 7092349
Show file tree

Hide file tree

Showing 39 changed files with 546 additions and 750 deletions.
diff --git a/modules/stormkit/Core/Containers/Tree.mpp b/modules/stormkit/Core/Containers/Tree.mpp
@@ -5,7 +5,6 @@
 module;
 
 #include <stormkit/Core/MemoryMacro.hpp>
-
 #include <stormkit/Core/PlatformMacro.hpp>
 
 export module stormkit.Core:Containers.Tree;
@@ -507,4 +506,4 @@ namespace stormkit::core {
 
         stream.close();
     }
-} // namespace stormkit::core
+} // namespace stormkit::core
diff --git a/modules/stormkit/Core/Containers/Utils.mpp b/modules/stormkit/Core/Containers/Utils.mpp
@@ -6,9 +6,7 @@ export module stormkit.Core:Containers.Utils;
 
 import std;
 
-import :Meta.Traits;
-import :Meta.Concepts;
-
+import :Meta;
 import :Utils.Byte;
 
 export namespace stormkit::core {

diff --git a/modules/stormkit/Core/Hash/Base.mpp b/modules/stormkit/Core/Hash/Base.mpp
@@ -6,7 +6,7 @@ export module stormkit.Core:Hash.Base;
 
 import std;
 
-import :Meta.Concepts;
+import :Meta;
 
 export namespace stormkit::core {
     using Hash32 = std::uint32_t;

diff --git a/modules/stormkit/Core/Hash/StringHash.mpp b/modules/stormkit/Core/Hash/StringHash.mpp
@@ -2,6 +2,10 @@
 // This file is subject to the license terms in the LICENSE file
 // found in the top-level of this distribution
 
+module;
+
+#include <stormkit/Core/PlatformMacro.hpp>
+
 export module stormkit.Core:Hash.StringHash;
 
 import std;
@@ -81,4 +85,4 @@ namespace stormkit::core {
         -> bool {
         return a.compare(b) == 0;
     }
-} // namespace stormkit::core
+} // namespace stormkit::core
diff --git a/modules/stormkit/Core/Meta/NamedType.mpp b/modules/stormkit/Core/Meta/NamedType.mpp
@@ -5,7 +5,6 @@
 module;
 
 #include <stormkit/Core/MemoryMacro.hpp>
-
 #include <stormkit/Core/HashMacro.hpp>
 
 export module stormkit.Core:Meta.NamedType;
@@ -488,4 +487,4 @@ namespace stormkit::core {
     constexpr auto MethodCallable::operator->(this auto&& self) -> decltype(auto) {
         return std::addressof(std::forward<decltype(self)>(self).get());
     }
-} // namespace stormkit::core
+} // namespace stormkit::core
diff --git a/modules/stormkit/Core/String/Operations.mpp b/modules/stormkit/Core/String/Operations.mpp
@@ -2,6 +2,10 @@
 // This file is subject to the license terms in the LICENSE file
 // found in the top-level of this distribution
 
+module;
+
+#include <stormkit/Core/PlatformMacro.hpp>
+
 export module stormkit.Core:String.Operations;
 
 import std;

diff --git a/modules/stormkit/Core/Utils.mpp b/modules/stormkit/Core/Utils.mpp
@@ -13,7 +13,6 @@ export import :Utils.Color;
 export import :Utils.Descriptors;
 export import :Utils.DeferInit;
 export import :Utils.DynamicLoader;
-export import :Utils.Expected;
 export import :Utils.ErrorHandling;
 export import :Utils.Filesystem;
 export import :Utils.Functional;
@@ -25,7 +24,6 @@ export import :Utils.Monadic;
 export import :Utils.NakedRef;
 export import :Utils.Numerics;
 export import :Utils.Pimpl;
-export import :Utils.Predicates;
 export import :Utils.Random;
 export import :Utils.Singleton;
 export import :Utils.Stacktrace;
diff --git a/modules/stormkit/Core/Utils/Expected.mpp b/modules/stormkit/Core/Utils/Expected.mpp
diff --git a/modules/stormkit/Core/Utils/Filesystem.mpp b/modules/stormkit/Core/Utils/Filesystem.mpp
@@ -2,6 +2,10 @@
 // This file is subject to the license terms in the LICENSE file
 // found in the top-level of this distribution
 
+module;
+
+#include <stormkit/Core/PlatformMacro.hpp>
+
 export module stormkit.Core:Utils.Filesystem;
 
 import std;
@@ -33,7 +37,8 @@ export namespace stormkit::core {
 namespace stormkit::core {
     ////////////////////////////////////////
     ////////////////////////////////////////
-    STORMKIT_INLINE auto read(std::istream& stream, RangeExtent size) noexcept -> std::vector<Byte> {
+    STORMKIT_FORCE_INLINE auto read(std::istream& stream,
+                                    RangeExtent   size) noexcept -> std::vector<Byte> {
         auto output = std::vector<Byte> {};
         output.resize(size);
 
@@ -45,7 +50,7 @@ namespace stormkit::core {
     ////////////////////////////////////////
     ////////////////////////////////////////
     template<RangeExtent size>
-    STORMKIT_INLINE auto read(std::istream& stream) noexcept -> std::array<Byte, size> {
+    STORMKIT_FORCE_INLINE auto read(std::istream& stream) noexcept -> std::array<Byte, size> {
         auto output = std::array<Byte, size> {};
 
         read(stream, output);
@@ -55,19 +60,21 @@ namespace stormkit::core {
 
     ////////////////////////////////////////
     ////////////////////////////////////////
-    inline auto read(std::istream& stream, std::span<Byte> output) noexcept -> void {
+    STORMKIT_FORCE_INLINE auto read(std::istream& stream, std::span<Byte> output) noexcept -> void {
         stream.read(std::bit_cast<char*>(std::data(output)), std::size(output));
     }
 
     ////////////////////////////////////////
     ////////////////////////////////////////
-    inline auto write(std::ostream& stream, std::span<const Byte> data) noexcept -> void {
+    STORMKIT_FORCE_INLINE auto write(std::ostream&         stream,
+                                     std::span<const Byte> data) noexcept -> void {
         stream.write(std::bit_cast<const char*>(std::data(data)), std::size(data));
     }
 
     ////////////////////////////////////////
     ////////////////////////////////////////
-    STORMKIT_INLINE auto readText(std::istream& stream, RangeExtent size) noexcept -> std::string {
+    STORMKIT_FORCE_INLINE auto readText(std::istream& stream,
+                                        RangeExtent   size) noexcept -> std::string {
         auto output = std::string {};
         output.resize(size);
 
@@ -78,13 +85,15 @@ namespace stormkit::core {
 
     ////////////////////////////////////////
     ////////////////////////////////////////
-    inline auto readText(std::istream& stream, std::span<char> output) noexcept -> void {
+    STORMKIT_FORCE_INLINE auto readText(std::istream&   stream,
+                                        std::span<char> output) noexcept -> void {
         stream.read(std::data(output), std::size(output));
     }
 
     ////////////////////////////////////////
     ////////////////////////////////////////
-    inline auto writeText(std::ostream& stream, std::string_view data) noexcept -> void {
+    STORMKIT_FORCE_INLINE auto writeText(std::ostream&    stream,
+                                         std::string_view data) noexcept -> void {
         stream.write(std::data(data), std::size(data));
     }
-} // namespace stormkit::core
+} // namespace stormkit::core