commit 9c6f6c39879597e9df8459d420a2384a2422566d
author Gregg Tavares <gman@chromium.org> Fri Sep 10 14:46:18 2021 -0700
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Sep 11 01:11:35 2021 +0000
tree 1a7f532041f91e9173c72729b375fb36c888f9b4
parent 7e8fa429930926fc330c46e9a7740749e01ecf9d

nullptr_t to std::nullptr_t

The Skia build requires std::nullptr_t

Bug: angleproject:6377
Change-Id: Ic41955e1dfefcf24bc39240d164ad938f523717c
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3154997
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Gregg Tavares <gman@chromium.org>

src/compiler/translator/tree_util/IntermRebuild.cpp

diff --git a/src/compiler/translator/tree_util/IntermRebuild.cpp b/src/compiler/translator/tree_util/IntermRebuild.cpp
index 4661571..4b45b10 100644
--- a/src/compiler/translator/tree_util/IntermRebuild.cpp
+++ b/src/compiler/translator/tree_util/IntermRebuild.cpp
@@ -56,7 +56,7 @@
       mSingle(node)
 {}
 
-TIntermRebuild::BaseResult::BaseResult(nullptr_t)
+TIntermRebuild::BaseResult::BaseResult(std::nullptr_t)
     : mAction(Action::Drop), mVisit(VisitBits::Neither), mSingle(nullptr)
 {}
 
@@ -116,7 +116,7 @@
 
 PreResult::PreResult(TIntermNode &node, VisitBits visit) : BaseResult(node, visit) {}
 PreResult::PreResult(TIntermNode *node, VisitBits visit) : BaseResult(node, visit) {}
-PreResult::PreResult(nullptr_t) : BaseResult(nullptr) {}
+PreResult::PreResult(std::nullptr_t) : BaseResult(nullptr) {}
 PreResult::PreResult(Fail) : BaseResult(Fail()) {}
 
 PreResult::PreResult(BaseResult &&other) : BaseResult(other) {}
@@ -133,7 +133,7 @@
 
 PostResult::PostResult(TIntermNode &node) : BaseResult(node, VisitBits::Neither) {}
 PostResult::PostResult(TIntermNode *node) : BaseResult(node, VisitBits::Neither) {}
-PostResult::PostResult(nullptr_t) : BaseResult(nullptr) {}
+PostResult::PostResult(std::nullptr_t) : BaseResult(nullptr) {}
 PostResult::PostResult(Fail) : BaseResult(Fail()) {}
 
 PostResult::PostResult(PostResult &&other) : BaseResult(other) {}

src/compiler/translator/tree_util/IntermRebuild.h

diff --git a/src/compiler/translator/tree_util/IntermRebuild.h b/src/compiler/translator/tree_util/IntermRebuild.h
index 675d747..9512270 100644
--- a/src/compiler/translator/tree_util/IntermRebuild.h
+++ b/src/compiler/translator/tree_util/IntermRebuild.h
@@ -102,7 +102,7 @@
         BaseResult(BaseResult &other);  // For subclass move constructor impls
         BaseResult(TIntermNode &node, VisitBits visit);
         BaseResult(TIntermNode *node, VisitBits visit);
-        BaseResult(nullptr_t);
+        BaseResult(std::nullptr_t);
         BaseResult(Fail);
         BaseResult(std::vector<TIntermNode *> &&nodes);
 
@@ -142,8 +142,8 @@
         PreResult(PreResult &&other);
         PreResult(TIntermNode &node, VisitBits visit = VisitBits::BothWhenSame);
         PreResult(TIntermNode *node, VisitBits visit = VisitBits::BothWhenSame);
-        PreResult(nullptr_t);  // Used to drop a node.
-        PreResult(Fail);       // Used to signal failure.
+        PreResult(std::nullptr_t);  // Used to drop a node.
+        PreResult(Fail);            // Used to signal failure.
 
         void operator=(PreResult &&other);
 
@@ -175,8 +175,8 @@
         PostResult(PostResult &&other);
         PostResult(TIntermNode &node);
         PostResult(TIntermNode *node);
-        PostResult(nullptr_t);  // Used to drop a node
-        PostResult(Fail);       // Used to signal failure.
+        PostResult(std::nullptr_t);  // Used to drop a node
+        PostResult(Fail);            // Used to signal failure.
 
         void operator=(PostResult &&other);