Title: [276431] trunk/Source/ThirdParty/ANGLE
Revision
276431
Author
[email protected]
Date
2021-04-22 05:14:39 -0700 (Thu, 22 Apr 2021)

Log Message

Unreviewed, WPE build fix after r276390

Fix namespacing issues in nullptr_t invocations.

* src/compiler/translator/tree_util/IntermRebuild.cpp:
(sh::TIntermRebuild::BaseResult::BaseResult):
(sh::PreResult::PreResult):
(sh::PostResult::PostResult):
* src/compiler/translator/tree_util/IntermRebuild.h:

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (276430 => 276431)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2021-04-22 11:52:14 UTC (rev 276430)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2021-04-22 12:14:39 UTC (rev 276431)
@@ -1,3 +1,15 @@
+2021-04-22  Philippe Normand  <[email protected]>
+
+        Unreviewed, WPE build fix after r276390
+
+        Fix namespacing issues in nullptr_t invocations.
+
+        * src/compiler/translator/tree_util/IntermRebuild.cpp:
+        (sh::TIntermRebuild::BaseResult::BaseResult):
+        (sh::PreResult::PreResult):
+        (sh::PostResult::PostResult):
+        * src/compiler/translator/tree_util/IntermRebuild.h:
+
 2021-04-21  Don Olmstead  <[email protected]>
 
         [Python 3] Update gni-to-cmake.py

Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermRebuild.cpp (276430 => 276431)


--- trunk/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermRebuild.cpp	2021-04-22 11:52:14 UTC (rev 276430)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermRebuild.cpp	2021-04-22 12:14:39 UTC (rev 276431)
@@ -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) {}

Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermRebuild.h (276430 => 276431)


--- trunk/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermRebuild.h	2021-04-22 11:52:14 UTC (rev 276430)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermRebuild.h	2021-04-22 12:14:39 UTC (rev 276431)
@@ -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,7 +142,7 @@
         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(std::nullptr_t);  // Used to drop a node.
         PreResult(Fail);       // Used to signal failure.
 
         void operator=(PreResult &&other);
@@ -175,7 +175,7 @@
         PostResult(PostResult &&other);
         PostResult(TIntermNode &node);
         PostResult(TIntermNode *node);
-        PostResult(nullptr_t);  // Used to drop a node
+        PostResult(std::nullptr_t);  // Used to drop a node
         PostResult(Fail);       // Used to signal failure.
 
         void operator=(PostResult &&other);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to