commit f69ae2d5d0e7eac3ca9f27fb252440d0cec28984
author Ian McKellar <ianloic@google.com> Fri May 16 18:02:03 2025 +0000
committer Ian McKellar <ianloic@google.com> Fri May 16 18:02:03 2025 +0000
tree 02df9db336180379aed957ec6bc36a164cb4131a
parent 5d7b63065d17c83a9c6451628262d243b02081e0

[cpp][cleanup] Stop using C++14 compat

Change-Id: I3af31e5c4469284a4939cad4a21c05904d24dee1

system/vulkan/goldfish_vulkan.cpp

diff --git a/system/vulkan/goldfish_vulkan.cpp b/system/vulkan/goldfish_vulkan.cpp
index 3cea336..71e9f91 100644
--- a/system/vulkan/goldfish_vulkan.cpp
+++ b/system/vulkan/goldfish_vulkan.cpp
@@ -25,6 +25,8 @@
 #include <zircon/system/public/zircon/process.h>
 
 #include <cstdarg>
+#include <optional>
+#include <string_view>
 
 #include "TraceProviderFuchsia.h"
 #include "services/service_connector.h"
@@ -776,9 +778,9 @@
 
 static thread_local zx_koid_t tid = GetKoid(zx_thread_self());
 
-cpp17::optional<cpp17::string_view> CStringToStringView(const char* cstr) {
+std::optional<std::string_view> CStringToStringView(const char* cstr) {
     if (!cstr) {
-        return cpp17::nullopt;
+        return std::nullopt;
     }
     return cstr;
 }
@@ -846,13 +848,13 @@
     }
 }
 
-extern "C" __attribute__((visibility("default"))) PFN_vkVoidFunction vk_icdGetInstanceProcAddr(
-    VkInstance instance, const char* name) {
+extern "C" __attribute__((visibility("default"))) PFN_vkVoidFunction
+vk_icdGetInstanceProcAddr(VkInstance instance, const char* name) {
     return VulkanDevice::GetInstance().GetInstanceProcAddr(instance, name);
 }
 
-extern "C" __attribute__((visibility("default"))) VkResult vk_icdNegotiateLoaderICDInterfaceVersion(
-    uint32_t* pSupportedVersion) {
+extern "C" __attribute__((visibility("default"))) VkResult
+vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) {
     *pSupportedVersion = std::min(*pSupportedVersion, 3u);
     return VK_SUCCESS;
 }
@@ -900,13 +902,13 @@
     }
 };
 
-extern "C" __attribute__((visibility("default"))) PFN_vkVoidFunction vk_icdGetInstanceProcAddr(
-    VkInstance instance, const char* name) {
+extern "C" __attribute__((visibility("default"))) PFN_vkVoidFunction
+vk_icdGetInstanceProcAddr(VkInstance instance, const char* name) {
     return VulkanDevice::GetInstance().GetInstanceProcAddr(instance, name);
 }
 
-extern "C" __attribute__((visibility("default"))) VkResult vk_icdNegotiateLoaderICDInterfaceVersion(
-    uint32_t* pSupportedVersion) {
+extern "C" __attribute__((visibility("default"))) VkResult
+vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) {
     *pSupportedVersion = std::min(*pSupportedVersion, 3u);
     return VK_SUCCESS;
 }