From a0d8362e005b1d348a08e9f8cea9b29eb4ddc507 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Mon, 30 Mar 2020 20:40:05 +0000 Subject: [PATCH] Add std:: to nullptr_t Fixes compiler error on Linux about bare nullptr_t not existing. Bug: Change-Id: I1eb97d40e9ff564775d4ec7bbc54430481475f34 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/18320 Reviewed-by: Corentin Wallez Commit-Queue: Ben Wagner --- src/common/vulkan_platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/vulkan_platform.h b/src/common/vulkan_platform.h index 3478fd6a11..113e831f43 100644 --- a/src/common/vulkan_platform.h +++ b/src/common/vulkan_platform.h @@ -174,7 +174,7 @@ namespace dawn_native { namespace vulkan { // Redefine VK_NULL_HANDLE for better type safety where possible. #undef VK_NULL_HANDLE #if defined(DAWN_PLATFORM_64_BIT) -static constexpr nullptr_t VK_NULL_HANDLE = nullptr; +static constexpr std::nullptr_t VK_NULL_HANDLE = nullptr; #elif defined(DAWN_PLATFORM_32_BIT) static constexpr uint64_t VK_NULL_HANDLE = 0; #else