summaryrefslogtreecommitdiff
path: root/src/locale
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/locale
parentf852e447159757a92564327c6b114f929200b3a0 (diff)
downloadtangara-fw-a231fd1c8afedbeb14b0bc77d76bad61db986059.tar.gz
Replace cpp::span shim with std::span
Diffstat (limited to 'src/locale')
-rw-r--r--src/locale/CMakeLists.txt2
-rw-r--r--src/locale/include/collation.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/locale/CMakeLists.txt b/src/locale/CMakeLists.txt
index 627ca314..9c1c2619 100644
--- a/src/locale/CMakeLists.txt
+++ b/src/locale/CMakeLists.txt
@@ -6,6 +6,6 @@ idf_component_register(
SRCS "collation.cpp" "strxfrm_l.c"
INCLUDE_DIRS "include"
PRIV_INCLUDE_DIRS "priv_include"
- REQUIRES "span" "esp_partition" "spi_flash")
+ REQUIRES "esp_partition" "spi_flash")
target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
diff --git a/src/locale/include/collation.hpp b/src/locale/include/collation.hpp
index b666860d..88f499c4 100644
--- a/src/locale/include/collation.hpp
+++ b/src/locale/include/collation.hpp
@@ -9,10 +9,10 @@
#include <cstddef>
#include <memory>
#include <optional>
+#include <span>
#include <string>
#include "esp_partition.h"
-#include "span.hpp"
#include "strxfrm.h"