diff options
| author | jacqueline <me@jacqueline.id.au> | 2024-05-02 17:06:25 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2024-05-02 17:06:25 +1000 |
| commit | a231fd1c8afedbeb14b0bc77d76bad61db986059 (patch) | |
| tree | 5cbb12f502445776072b691bdebcd0ef6ef54d12 /src/database/track.cpp | |
| parent | f852e447159757a92564327c6b114f929200b3a0 (diff) | |
| download | tangara-fw-a231fd1c8afedbeb14b0bc77d76bad61db986059.tar.gz | |
Replace cpp::span shim with std::span
Diffstat (limited to 'src/database/track.cpp')
| -rw-r--r-- | src/database/track.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/database/track.cpp b/src/database/track.cpp index a2bd05d3..1b1442a1 100644 --- a/src/database/track.cpp +++ b/src/database/track.cpp @@ -9,6 +9,7 @@ #include <iomanip> #include <iostream> #include <memory_resource> +#include <span> #include <sstream> #include <string> @@ -16,7 +17,6 @@ #include "komihash.h" #include "memory_resource.hpp" -#include "span.hpp" namespace database { @@ -55,7 +55,7 @@ auto tagHash(const TagValue& t) -> uint64_t { } else if constexpr (std::is_same_v<T, uint32_t>) { return komihash(&arg, sizeof(arg), 0); } else if constexpr (std::is_same_v< - T, cpp::span<const std::pmr::string>>) { + T, std::span<const std::pmr::string>>) { komihash_stream_t hash; komihash_stream_init(&hash, 0); for (const auto& i : arg) { @@ -79,7 +79,7 @@ auto tagToString(const TagValue& val) -> std::string { } else if constexpr (std::is_same_v<T, uint32_t>) { return std::to_string(arg); } else if constexpr (std::is_same_v< - T, cpp::span<const std::pmr::string>>) { + T, std::span<const std::pmr::string>>) { std::ostringstream builder{}; for (const auto& str : arg) { builder << std::string{str.data(), str.size()} << ","; @@ -225,7 +225,7 @@ auto TrackTags::albumOrder() const -> uint32_t { return (disc_.value_or(0) << 16) | track_.value_or(0); } -auto TrackTags::genres() const -> cpp::span<const std::pmr::string> { +auto TrackTags::genres() const -> std::span<const std::pmr::string> { return genres_; } |
