diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-02-14 21:22:26 -0800 |
|---|---|---|
| committer | Ryan Prichard <rprichard@google.com> | 2024-02-15 10:11:46 -0800 |
| commit | d0b3b9b83b7071e63b46040c905d2112106c6224 (patch) | |
| tree | f78982ff5bcfa687140e6d93b1ea130392d9c1f9 | |
| parent | 8441f7503b21c46933d6ee2c8ba5f6b958566f9f (diff) | |
| download | goldfish-opengl-d0b3b9b83b7071e63b46040c905d2112106c6224.tar.gz | |
Replace basic_string_view<uint8_t> with span
In newer versions of libc++, std::char_traits<T> is no longer defined
for non-character types, and a result, std::basic_string_view<uint8_t>
is also no longer defined. See
https://discourse.llvm.org/t/deprecating-std-string-t-for-non-character-t/66779.
Bug: 175635923
Test: m android.hardware.graphics.composer3-service.ranchu
Change-Id: I7ae7895d45a32c2e386fe2ba2bcdb44330d8bea3
| -rw-r--r-- | system/hwc3/DrmConnector.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/system/hwc3/DrmConnector.cpp b/system/hwc3/DrmConnector.cpp index 0c8f6584..dac64058 100644 --- a/system/hwc3/DrmConnector.cpp +++ b/system/hwc3/DrmConnector.cpp @@ -16,6 +16,8 @@ #include "DrmConnector.h" +#include <span> + namespace aidl::android::hardware::graphics::composer3::impl { namespace { @@ -98,13 +100,13 @@ bool DrmConnector::loadEdid(::android::base::borrowed_fd drmFd) { drmModeFreePropertyBlob(blob); - using byte_view = std::basic_string_view<uint8_t>; + using byte_view = std::span<const uint8_t>; constexpr size_t kEdidDescriptorOffset = 54; constexpr size_t kEdidDescriptorLength = 18; - byte_view edid(mEdid->data(), mEdid->size()); - edid.remove_prefix(kEdidDescriptorOffset); + byte_view edid(*mEdid); + edid = edid.subspan(kEdidDescriptorOffset); byte_view descriptor(edid.data(), kEdidDescriptorLength); if (descriptor[0] == 0 && descriptor[1] == 0) { |