From 83547974061b2897f429d4f964e1caffee9b5039 Mon Sep 17 00:00:00 2001
From: Andrey Nekrasov <yuyoyuppe@users.noreply.github.com>
Date: Tue, 28 Jul 2020 14:26:30 +0300
Subject: [PATCH] CDPx: do not use span header (#5268)

---
 src/bootstrapper/bootstrapper.cpp | 1 -
 src/common/RcResource.cpp         | 4 ++--
 src/common/RcResource.h           | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/bootstrapper/bootstrapper.cpp b/src/bootstrapper/bootstrapper.cpp
index 04ab6ab610..c61c681770 100644
--- a/src/bootstrapper/bootstrapper.cpp
+++ b/src/bootstrapper/bootstrapper.cpp
@@ -18,7 +18,6 @@
 #include <wil/resource.h>
 
 #include <winrt/base.h>
-#include <span>
 #include "resource.h"
 #include <Msi.h>
 
diff --git a/src/common/RcResource.cpp b/src/common/RcResource.cpp
index bde1edc94c..b4793968ff 100644
--- a/src/common/RcResource.cpp
+++ b/src/common/RcResource.cpp
@@ -25,7 +25,7 @@ std::optional<RcResource> RcResource::create(int resource_id, const std::wstring
     {
         return std::nullopt;
     }
-    return RcResource{ { res, resSize } };
+    return RcResource{ res, resSize };
 }
 
 bool RcResource::saveAsFile(const std::filesystem::path destination)
@@ -35,6 +35,6 @@ bool RcResource::saveAsFile(const std::filesystem::path destination)
     {
         return false;
     }
-    installerFile.write(reinterpret_cast<const char*>(_memory.data()), _memory.size());
+    installerFile.write(reinterpret_cast<const char*>(_memory), _size);
     return true;
 }
diff --git a/src/common/RcResource.h b/src/common/RcResource.h
index 54b9b732ef..120639ebbf 100644
--- a/src/common/RcResource.h
+++ b/src/common/RcResource.h
@@ -2,21 +2,21 @@
 
 #include <string_view>
 #include <optional>
-#include <span>
 #include <filesystem>
 
 class RcResource
 {
 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);
     bool saveAsFile(const std::filesystem::path destination);
 
 private:
     RcResource() = delete;
-    RcResource(std::span<const std::byte> memory) :
-        _memory{ std::move(memory) }
+    RcResource(const std::byte* memory, size_t size) :
+        _memory{ memory }, _size{ size }
     {
     }
 };