Merge branch 'span' into 'master'

Replace Misc::Span by std::span

See merge request OpenMW/openmw!2324

apps/openmw/mwbase/world.hpp

@@ -8,10 +8,10 @@
 #include <set>
 #include <string_view>
 #include <deque>
+#include <span>
 
 #include <components/esm3/cellid.hpp>
 #include <components/misc/rng.hpp>
-#include <components/misc/span.hpp>
 
 #include <osg/Timer>
 
@@ -661,7 +661,7 @@ namespace MWBase
             virtual bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const = 0;
 
             virtual bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const = 0;
+                std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const = 0;
 
             virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
 

apps/openmw/mwphysics/physicssystem.cpp

@@ -903,7 +903,7 @@ namespace MWPhysics
     }
 
     bool PhysicsSystem::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-        const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
+        std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
     {
         std::vector<const btCollisionObject*> ignoredObjects;
         ignoredObjects.reserve(ignore.size());

apps/openmw/mwphysics/physicssystem.hpp

@@ -10,13 +10,13 @@
 #include <variant>
 #include <optional>
 #include <functional>
+#include <span>
 
 #include <osg/Quat>
 #include <osg/BoundingBox>
 #include <osg/ref_ptr>
 #include <osg/Timer>
 
-#include <components/misc/span.hpp>
 #include <components/detournavigator/collisionshapetype.hpp>
 
 #include "../mwworld/ptr.hpp"
@@ -280,7 +280,7 @@ namespace MWPhysics
             }
 
             bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const;
+                std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors) const;
 
             void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
             void reportCollision(const btVector3& position, const btVector3& normal);

apps/openmw/mwworld/worldimp.cpp

@@ -3979,7 +3979,7 @@ namespace MWWorld
     }
 
     bool World::isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-        const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
+        std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors) const
     {
         return mPhysics->isAreaOccupiedByOtherActor(position, radius, ignore, occupyingActors);
     }

apps/openmw/mwworld/worldimp.hpp

@@ -749,7 +749,7 @@ namespace MWWorld
             bool hasCollisionWithDoor(const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const override;
 
             bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
-                const Misc::Span<const MWWorld::ConstPtr>& ignore, std::vector<MWWorld::Ptr>* occupyingActors) const override;
+                std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors) const override;
 
             void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
 

components/misc/span.hpp

@@ -1,36 +0,0 @@
-#ifndef OPENMW_COMPONENTS_MISC_SPAN_H
-#define OPENMW_COMPONENTS_MISC_SPAN_H
-
-#include <cstddef>
-
-namespace Misc
-{
-    template <class T>
-    class Span
-    {
-        public:
-            constexpr Span() = default;
-
-            constexpr Span(T* pointer, std::size_t size)
-                : mPointer(pointer)
-                , mSize(size)
-            {}
-
-            template <class Range>
-            constexpr Span(Range& range)
-                : Span(range.data(), range.size())
-            {}
-
-            constexpr T* begin() const { return mPointer; }
-
-            constexpr T* end() const { return mPointer + mSize; }
-
-            constexpr std::size_t size() const { return mSize; }
-
-        private:
-            T* mPointer = nullptr;
-            std::size_t mSize = 0;
-    };
-}
-
-#endif