From 8bacd9bdc49c376af69c81ac9acf2e9db1f10cb5 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 22 Apr 2021 09:10:15 +0200
Subject: [PATCH] LSP: add std namespace to nullptr_t usages

Change-Id: I2bc3e7324c168201a4755bec6f79c5aa6ffc8540
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/libs/languageserverprotocol/semantictokens.cpp |  4 ++--
 src/libs/languageserverprotocol/semantictokens.h   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libs/languageserverprotocol/semantictokens.cpp b/src/libs/languageserverprotocol/semantictokens.cpp
index 4274dbfc12f..fc8233b1704 100644
--- a/src/libs/languageserverprotocol/semantictokens.cpp
+++ b/src/libs/languageserverprotocol/semantictokens.cpp
@@ -126,7 +126,7 @@ SemanticTokensResult::SemanticTokensResult(const QJsonValue &value)
     if (value.isObject())
         emplace<SemanticTokens>(SemanticTokens(value.toObject()));
     else
-        emplace<nullptr_t>(nullptr);
+        emplace<std::nullptr_t>(nullptr);
 }
 
 SemanticTokensFullDeltaRequest::SemanticTokensFullDeltaRequest(const SemanticTokensDeltaParams &params)
@@ -147,7 +147,7 @@ SemanticTokensDeltaResult::SemanticTokensDeltaResult(const QJsonValue &value)
         else
             emplace<SemanticTokens>(object);
     } else {
-        emplace<nullptr_t>(nullptr);
+        emplace<std::nullptr_t>(nullptr);
     }
 }
 
diff --git a/src/libs/languageserverprotocol/semantictokens.h b/src/libs/languageserverprotocol/semantictokens.h
index d35704d1cf7..8d23e31154d 100644
--- a/src/libs/languageserverprotocol/semantictokens.h
+++ b/src/libs/languageserverprotocol/semantictokens.h
@@ -162,7 +162,7 @@ public:
 };
 
 class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensResult
-    : public Utils::variant<SemanticTokens, nullptr_t>
+    : public Utils::variant<SemanticTokens, std::nullptr_t>
 {
 public:
     using variant::variant;
@@ -170,7 +170,7 @@ public:
 };
 
 class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensFullRequest
-    : public Request<SemanticTokensResult, nullptr_t, SemanticTokensParams>
+    : public Request<SemanticTokensResult, std::nullptr_t, SemanticTokensParams>
 {
 public:
     explicit SemanticTokensFullRequest(const SemanticTokensParams &params);
@@ -213,7 +213,7 @@ public:
 };
 
 class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensDeltaResult
-    : public Utils::variant<SemanticTokens, SemanticTokensDelta, nullptr_t>
+    : public Utils::variant<SemanticTokens, SemanticTokensDelta, std::nullptr_t>
 {
 public:
     using variant::variant;
@@ -221,7 +221,7 @@ public:
 };
 
 class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensFullDeltaRequest
-    : public Request<SemanticTokensDeltaResult, nullptr_t, SemanticTokensDeltaParams>
+    : public Request<SemanticTokensDeltaResult, std::nullptr_t, SemanticTokensDeltaParams>
 {
 public:
     explicit SemanticTokensFullDeltaRequest(const SemanticTokensDeltaParams &params);
@@ -230,7 +230,7 @@ public:
 };
 
 class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensRangeRequest
-    : public Request<SemanticTokensResult, nullptr_t, SemanticTokensRangeParams>
+    : public Request<SemanticTokensResult, std::nullptr_t, SemanticTokensRangeParams>
 {
 public:
     explicit SemanticTokensRangeRequest(const SemanticTokensRangeParams &params);