Update includes and Fix mistakes

wopss · Feb 5, 2025 · 21fb745 · 21fb745
1 parent f3d1094
commit 21fb745
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/include/RED4ext/Containers/DynArray.hpp b/include/RED4ext/Containers/DynArray.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <algorithm>
+#include <cassert>
 #include <cstdint>
 #include <functional>
 #include <type_traits>
@@ -135,9 +136,14 @@ struct DynArray
         return Data()[static_cast<SizeType>(aPos)];
     }
 
-    [[nodiscard]] constexpr Iterator Find(ConstReference aValue) const noexcept
+    [[nodiscard]] constexpr Iterator Find(ConstReference aValue) noexcept
     {
-        return std::find(cbegin(), cend(), aValue);
+        return Iterator(std::find(begin(), end(), aValue));
+    }
+
+    [[nodiscard]] constexpr ConstIterator Find(ConstReference aValue) const noexcept
+    {
+        return ConstIterator(std::find(cbegin(), cend(), aValue));
     }
 
     [[nodiscard]] bool Contains(ConstReference aValue) const

diff --git a/include/RED4ext/Containers/Span.hpp b/include/RED4ext/Containers/Span.hpp
@@ -46,7 +46,7 @@ struct Span
         return IsEmpty();
     }
 
-    constexpr Reference operator[](SizeType aPos) const
+    constexpr Reference operator[](SizeType aPos)
     {
         assert(aPos < Size());
         return Data()[aPos];
@@ -69,7 +69,7 @@ struct Span
     }
 
 #pragma region Iterator
-    [[nodiscard]] constexpr Iterator begin() const noexcept
+    [[nodiscard]] constexpr Iterator begin() noexcept
     {
         return beginPtr;
     }
@@ -84,7 +84,7 @@ struct Span
         return begin();
     }
 
-    [[nodiscard]] constexpr Iterator end() const noexcept
+    [[nodiscard]] constexpr Iterator end() noexcept
     {
         return endPtr;
     }
@@ -105,7 +105,7 @@ struct Span
         return !Data();
     }
 
-    [[nodiscard]] constexpr Pointer Data() const noexcept
+    [[nodiscard]] constexpr Pointer Data() noexcept
     {
         return beginPtr;
     }

diff --git a/include/RED4ext/GpuApi/CommandListContext.hpp b/include/RED4ext/GpuApi/CommandListContext.hpp
@@ -2,7 +2,7 @@
 
 #include <RED4ext/CString.hpp>
 #include <RED4ext/Common.hpp>
-#include <RED4ext/DynArray.hpp>
+#include <RED4ext/Containers/DynArray.hpp>
 #include <RED4ext/Memory/UniquePtr.hpp>
 #include <RED4ext/StringView.hpp>
 

diff --git a/include/RED4ext/LaunchParameters.hpp b/include/RED4ext/LaunchParameters.hpp
@@ -2,7 +2,7 @@
 
 #include <RED4ext/CString.hpp>
 #include <RED4ext/Common.hpp>
-#include <RED4ext/DynArray.hpp>
+#include <RED4ext/Containers/DynArray.hpp>
 #include <RED4ext/HashMap.hpp>
 
 namespace RED4ext

diff --git a/include/RED4ext/ResourceDepot.hpp b/include/RED4ext/ResourceDepot.hpp
@@ -4,7 +4,7 @@
 
 #include <RED4ext/CString.hpp>
 #include <RED4ext/Common.hpp>
-#include <RED4ext/DynArray.hpp>
+#include <RED4ext/Containers/DynArray.hpp>
 #include <RED4ext/ResourcePath.hpp>
 
 namespace RED4ext

diff --git a/include/RED4ext/Scripting/Natives/CMesh.hpp b/include/RED4ext/Scripting/Natives/CMesh.hpp
@@ -2,7 +2,7 @@
 
 #include <RED4ext/CName.hpp>
 #include <RED4ext/Common.hpp>
-#include <RED4ext/DynArray.hpp>
+#include <RED4ext/Containers/DynArray.hpp>
 #include <RED4ext/Handle.hpp>
 #include <RED4ext/NativeTypes.hpp>
 #include <RED4ext/RenderResource.hpp>

diff --git a/include/RED4ext/Scripting/Natives/inkWidget.hpp b/include/RED4ext/Scripting/Natives/inkWidget.hpp
@@ -2,7 +2,7 @@
 
 #include <RED4ext/CName.hpp>
 #include <RED4ext/Common.hpp>
-#include <RED4ext/DynArray.hpp>
+#include <RED4ext/Containers/DynArray.hpp>
 #include <RED4ext/Handle.hpp>
 #include <RED4ext/Scripting/IScriptable.hpp>
 #include <RED4ext/Scripting/Natives/Generated/HDRColor.hpp>

diff --git a/include/RED4ext/Scripting/Natives/redTagList.hpp b/include/RED4ext/Scripting/Natives/redTagList.hpp
@@ -2,7 +2,7 @@
 
 #include <RED4ext/CName.hpp>
 #include <RED4ext/Common.hpp>
-#include <RED4ext/DynArray.hpp>
+#include <RED4ext/Containers/DynArray.hpp>
 
 namespace RED4ext
 {

diff --git a/include/RED4ext/Scripting/ScriptReport.hpp b/include/RED4ext/Scripting/ScriptReport.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <RED4ext/CString.hpp>
-#include <RED4ext/DynArray.hpp>
+#include <RED4ext/Containers/DynArray.hpp>
 #include <cstdarg>
 
 namespace RED4ext

diff --git a/src/Scripting/Natives.cpp b/src/Scripting/Natives.cpp
@@ -3,7 +3,7 @@
 #endif
 
 #include <RED4ext/CName.hpp>
-#include <RED4ext/DynArray.hpp>
+#include <RED4ext/Containers/DynArray.hpp>
 #include <RED4ext/GameEngine.hpp>
 #include <RED4ext/Handle.hpp>
 #include <RED4ext/ISerializable.hpp>