summaryrefslogtreecommitdiff
path: root/src/memory/include
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2024-05-02 17:06:25 +1000
committerjacqueline <me@jacqueline.id.au>2024-05-02 17:06:25 +1000
commita231fd1c8afedbeb14b0bc77d76bad61db986059 (patch)
tree5cbb12f502445776072b691bdebcd0ef6ef54d12 /src/memory/include
parentf852e447159757a92564327c6b114f929200b3a0 (diff)
downloadtangara-fw-a231fd1c8afedbeb14b0bc77d76bad61db986059.tar.gz
Replace cpp::span shim with std::span
Diffstat (limited to 'src/memory/include')
-rw-r--r--src/memory/include/himem.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/memory/include/himem.hpp b/src/memory/include/himem.hpp
index 81166e0d..f70648a9 100644
--- a/src/memory/include/himem.hpp
+++ b/src/memory/include/himem.hpp
@@ -8,9 +8,9 @@
#include <cstddef>
#include <cstdint>
+#include <span>
#include "esp32/himem.h"
-#include "span.hpp"
/*
* Wrapper around an ESP-IDF himem allocation, which uses RAII to clean up after
@@ -62,14 +62,14 @@ class MappableRegion {
}
}
- auto Get() -> cpp::span<std::byte> {
+ auto Get() -> std::span<std::byte> {
if (bytes_ == nullptr) {
return {};
}
return {bytes_, size};
}
- auto Map(const HimemAlloc<size>& alloc) -> cpp::span<std::byte> {
+ auto Map(const HimemAlloc<size>& alloc) -> std::span<std::byte> {
assert(bytes_ == nullptr);
ESP_ERROR_CHECK(esp_himem_map(alloc.handle, range_handle, 0, 0, size, 0,
reinterpret_cast<void**>(&bytes_)));