commit 6ba6eadce47bb9e304e06ac7b8ed15f73ad4bca9
author Jamie Madill <jmadill@chromium.org> Mon May 04 14:21:21 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Mon May 04 19:55:25 2015 +0000
tree b6f68d2e73f8b78263768681587a0678565689c9
parent c07c43e43f0ec5dd619f55e06320b8f1542fab77

Rename ConstantUnion to TConstantUnion.

This clarified that we're using the Pool allocator/deallocator for
this type.

BUG=angleproject:993

Change-Id: If8c95f6054d07291e7014be0d4e35766ba2e943b
Reviewed-on: https://chromium-review.googlesource.com/269131
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>

src/compiler/translator/parseConst.cpp

diff --git a/src/compiler/translator/parseConst.cpp b/src/compiler/translator/parseConst.cpp
index 1897ed1..cb9dfa8 100644
--- a/src/compiler/translator/parseConst.cpp
+++ b/src/compiler/translator/parseConst.cpp
@@ -13,7 +13,7 @@
 class TConstTraverser : public TIntermTraverser
 {
   public:
-    TConstTraverser(ConstantUnion *cUnion, bool singleConstParam,
+    TConstTraverser(TConstantUnion *cUnion, bool singleConstParam,
                     TOperator constructType, TInfoSink &sink, TType &t)
         : error(false),
           mIndex(0),
@@ -42,7 +42,7 @@
     bool visitBranch(Visit visit, TIntermBranch *);
 
     size_t mIndex;
-    ConstantUnion *mUnionArray;
+    TConstantUnion *mUnionArray;
     TType mType;
     TOperator mConstructorType;
     bool mSingleConstantParam;
@@ -167,7 +167,7 @@
         return;
     }
 
-    ConstantUnion *leftUnionArray = mUnionArray;
+    TConstantUnion *leftUnionArray = mUnionArray;
     size_t instanceSize = mType.getObjectSize();
     TBasicType basicType = mType.getBasicType();
 
@@ -177,7 +177,7 @@
     if (!mSingleConstantParam)
     {
         size_t objectSize = node->getType().getObjectSize();
-        ConstantUnion *rightUnionArray = node->getUnionArrayPointer();
+        TConstantUnion *rightUnionArray = node->getUnionArrayPointer();
         for (size_t i=0; i < objectSize; i++)
         {
             if (mIndex >= instanceSize)
@@ -189,7 +189,7 @@
     else
     {
         size_t totalSize = mIndex + mSize;
-        ConstantUnion *rightUnionArray = node->getUnionArrayPointer();
+        TConstantUnion *rightUnionArray = node->getUnionArrayPointer();
         if (!mIsDiagonalMatrixInit)
         {
             int count = 0;
@@ -247,7 +247,7 @@
 // type of node.  It's children will still be processed.
 //
 bool TIntermediate::parseConstTree(
-    const TSourceLoc &line, TIntermNode *root, ConstantUnion *unionArray,
+    const TSourceLoc &line, TIntermNode *root, TConstantUnion *unionArray,
     TOperator constructorType, TType t, bool singleConstantParam)
 {
     if (root == 0)