From d2683038d627de8fbfdc388ff1ef21f5f6f3fef9 Mon Sep 17 00:00:00 2001 From: Janine Liu Date: Thu, 21 Nov 2024 14:31:16 -0500 Subject: [PATCH] Replace gsl with std --- native~/Runtime/src/TestGltfModelImpl.cpp | 34 +++++++++---------- .../Shared/src/NativeDownloadHandlerImpl.h | 2 +- native~/Shared/src/UnityAssetAccessor.cpp | 4 +-- native~/Shared/src/UnityAssetAccessor.h | 2 +- native~/extern/cesium-native | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/native~/Runtime/src/TestGltfModelImpl.cpp b/native~/Runtime/src/TestGltfModelImpl.cpp index a4b55a09..6f4bc399 100644 --- a/native~/Runtime/src/TestGltfModelImpl.cpp +++ b/native~/Runtime/src/TestGltfModelImpl.cpp @@ -186,7 +186,7 @@ TestGltfModelImpl::AddBooleanPropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -221,7 +221,7 @@ TestGltfModelImpl::AddIntPropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -233,7 +233,7 @@ TestGltfModelImpl::AddIntPropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -265,7 +265,7 @@ TestGltfModelImpl::AddDoublePropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -298,7 +298,7 @@ TestGltfModelImpl::AddVec2PropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -331,7 +331,7 @@ TestGltfModelImpl::AddVec3PropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -368,7 +368,7 @@ TestGltfModelImpl::AddVec4PropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -406,7 +406,7 @@ TestGltfModelImpl::AddMat2PropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -445,7 +445,7 @@ TestGltfModelImpl::AddMat3PropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -485,7 +485,7 @@ TestGltfModelImpl::AddMat4PropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -545,11 +545,11 @@ TestGltfModelImpl::AddStringPropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( stringBuffer.cesium.data.data(), stringBuffer.cesium.data.size()), - gsl::span(), - gsl::span( + std::span(), + std::span( offsetBuffer.cesium.data.data(), offsetBuffer.cesium.data.size()), CesiumGltf::PropertyComponentType::None, @@ -588,7 +588,7 @@ TestGltfModelImpl::AddFixedLengthArrayPropertyTableProperty( property, classProperty, numValues / count, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size())); @@ -642,13 +642,13 @@ TestGltfModelImpl::AddVariableLengthArrayPropertyTableProperty( property, classProperty, size, - gsl::span( + std::span( buffer.cesium.data.data(), buffer.cesium.data.size()), - gsl::span( + std::span( offsetBuffer.cesium.data.data(), offsetBuffer.cesium.data.size()), - gsl::span(), + std::span(), CesiumGltf::PropertyComponentType::Uint16, CesiumGltf::PropertyComponentType::None); diff --git a/native~/Shared/src/NativeDownloadHandlerImpl.h b/native~/Shared/src/NativeDownloadHandlerImpl.h index 5c925a3a..2766829c 100644 --- a/native~/Shared/src/NativeDownloadHandlerImpl.h +++ b/native~/Shared/src/NativeDownloadHandlerImpl.h @@ -2,7 +2,7 @@ #include "CesiumImpl.h" -#include +#include #include #include diff --git a/native~/Shared/src/UnityAssetAccessor.cpp b/native~/Shared/src/UnityAssetAccessor.cpp index c05af172..5ca59294 100644 --- a/native~/Shared/src/UnityAssetAccessor.cpp +++ b/native~/Shared/src/UnityAssetAccessor.cpp @@ -66,7 +66,7 @@ class UnityAssetResponse : public IAssetResponse { virtual const HttpHeaders& headers() const override { return _headers; } - virtual gsl::span data() const override { + virtual std::span data() const override { return this->_data; } @@ -202,7 +202,7 @@ UnityAssetAccessor::request( const std::string& verb, const std::string& url, const std::vector& headers, - const gsl::span& contentPayload) { + const std::span& contentPayload) { if (contentPayload.size() > size_t(std::numeric_limits::max())) { // This implementation cannot be used to send more than 2 gigabytes - just diff --git a/native~/Shared/src/UnityAssetAccessor.h b/native~/Shared/src/UnityAssetAccessor.h index 65b54f87..891400c5 100644 --- a/native~/Shared/src/UnityAssetAccessor.h +++ b/native~/Shared/src/UnityAssetAccessor.h @@ -19,7 +19,7 @@ class UnityAssetAccessor : public CesiumAsync::IAssetAccessor { const std::string& verb, const std::string& url, const std::vector& headers = std::vector(), - const gsl::span& contentPayload = {}) override; + const std::span& contentPayload = {}) override; virtual void tick() noexcept override; diff --git a/native~/extern/cesium-native b/native~/extern/cesium-native index 544b2b3c..9571f32d 160000 --- a/native~/extern/cesium-native +++ b/native~/extern/cesium-native @@ -1 +1 @@ -Subproject commit 544b2b3c108bec58b29f897da0a1e30600ae1e3a +Subproject commit 9571f32d62d0bdc6dda1dae6d33b25f3d486bb0e