CDPx: do not use span header (#5268)

This commit is contained in:
Andrey Nekrasov
2020-07-28 14:26:30 +03:00
committed by GitHub
parent 87ae1c6a9b
commit 8354797406
3 changed files with 6 additions and 7 deletions

View File

@@ -18,7 +18,6 @@
#include <wil/resource.h> #include <wil/resource.h>
#include <winrt/base.h> #include <winrt/base.h>
#include <span>
#include "resource.h" #include "resource.h"
#include <Msi.h> #include <Msi.h>

View File

@@ -25,7 +25,7 @@ std::optional<RcResource> RcResource::create(int resource_id, const std::wstring
{ {
return std::nullopt; return std::nullopt;
} }
return RcResource{ { res, resSize } }; return RcResource{ res, resSize };
} }
bool RcResource::saveAsFile(const std::filesystem::path destination) bool RcResource::saveAsFile(const std::filesystem::path destination)
@@ -35,6 +35,6 @@ bool RcResource::saveAsFile(const std::filesystem::path destination)
{ {
return false; return false;
} }
installerFile.write(reinterpret_cast<const char*>(_memory.data()), _memory.size()); installerFile.write(reinterpret_cast<const char*>(_memory), _size);
return true; return true;
} }

View File

@@ -2,21 +2,21 @@
#include <string_view> #include <string_view>
#include <optional> #include <optional>
#include <span>
#include <filesystem> #include <filesystem>
class RcResource class RcResource
{ {
public: public:
std::span<const std::byte> _memory; const std::byte* _memory = nullptr;
size_t _size = 0;
static std::optional<RcResource> create(int resource_id, const std::wstring_view resource_class); static std::optional<RcResource> create(int resource_id, const std::wstring_view resource_class);
bool saveAsFile(const std::filesystem::path destination); bool saveAsFile(const std::filesystem::path destination);
private: private:
RcResource() = delete; RcResource() = delete;
RcResource(std::span<const std::byte> memory) : RcResource(const std::byte* memory, size_t size) :
_memory{ std::move(memory) } _memory{ memory }, _size{ size }
{ {
} }
}; };