From a231fd1c8afedbeb14b0bc77d76bad61db986059 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 2 May 2024 17:06:25 +1000
Subject: Replace cpp::span shim with std::span

---
 src/codecs/source_buffer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/codecs/source_buffer.cpp')

diff --git a/src/codecs/source_buffer.cpp b/src/codecs/source_buffer.cpp
index 0a986bc3..538d7f47 100644
--- a/src/codecs/source_buffer.cpp
+++ b/src/codecs/source_buffer.cpp
@@ -39,7 +39,7 @@ auto SourceBuffer::Refill(IStream* src) -> bool {
     return false;
   }
   bool eof = false;
-  AddBytes([&](cpp::span<std::byte> buf) -> size_t {
+  AddBytes([&](std::span<std::byte> buf) -> size_t {
     ssize_t bytes_read = src->Read(buf);
     // Treat read errors as EOF.
     eof = bytes_read <= 0;
@@ -48,7 +48,7 @@ auto SourceBuffer::Refill(IStream* src) -> bool {
   return eof;
 }
 
-auto SourceBuffer::AddBytes(std::function<size_t(cpp::span<std::byte>)> writer)
+auto SourceBuffer::AddBytes(std::function<size_t(std::span<std::byte>)> writer)
     -> void {
   if (offset_of_bytes_ > 0) {
     std::memmove(buffer_.data(), buffer_.data() + offset_of_bytes_,
@@ -61,7 +61,7 @@ auto SourceBuffer::AddBytes(std::function<size_t(cpp::span<std::byte>)> writer)
 }
 
 auto SourceBuffer::ConsumeBytes(
-    std::function<size_t(cpp::span<std::byte>)> reader) -> void {
+    std::function<size_t(std::span<std::byte>)> reader) -> void {
   size_t bytes_consumed = std::invoke(
       reader, buffer_.subspan(offset_of_bytes_, bytes_in_buffer_));
   assert(bytes_consumed <= bytes_in_buffer_);
-- 
cgit v1.2.3


From 26eb580043ad176bdc58d996f30d470e1073ef00 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 2 May 2024 21:52:59 +1000
Subject: move driver includes into a subdir as well

---
 src/codecs/source_buffer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/codecs/source_buffer.cpp')

diff --git a/src/codecs/source_buffer.cpp b/src/codecs/source_buffer.cpp
index 538d7f47..9cd648cd 100644
--- a/src/codecs/source_buffer.cpp
+++ b/src/codecs/source_buffer.cpp
@@ -62,8 +62,8 @@ auto SourceBuffer::AddBytes(std::function<size_t(std::span<std::byte>)> writer)
 
 auto SourceBuffer::ConsumeBytes(
     std::function<size_t(std::span<std::byte>)> reader) -> void {
-  size_t bytes_consumed = std::invoke(
-      reader, buffer_.subspan(offset_of_bytes_, bytes_in_buffer_));
+  size_t bytes_consumed =
+      std::invoke(reader, buffer_.subspan(offset_of_bytes_, bytes_in_buffer_));
   assert(bytes_consumed <= bytes_in_buffer_);
 
   bytes_in_buffer_ -= bytes_consumed;
-- 
cgit v1.2.3