commit 94bf7f228d5a2f153ae9cb808f65ef9fbaa4005f
author Jamie Madill <jmadill@transgaming.com> Mon Jul 08 13:31:15 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:06:12 2013 -0400
tree b92b2bf4f589a223714c6f90e943c17d52196ba1
parent 7164cf4776a267d079e99a7d96d0496314ab9300

Used size_t for object size instead of signed int.
BUG=crbug 179653
R=aedla@chromium.org, kbr@chromium.org

Review URL: https://codereview.appspot.com/8834048

git-svn-id: https://angleproject.googlecode.com/svn/trunk@2211 736b8ea6-26fd-11df-bfd4-992fa37f6226

TRAC #23333
Authored-by: alokp@chromium.org
Signed-off-by: Shannon Woods
Signed-off-by Nicolas Capens
Merged-by: Jamie Madill

src/compiler/parseConst.cpp

diff --git a/src/compiler/parseConst.cpp b/src/compiler/parseConst.cpp
index fd2af0e..769a7b3 100644
--- a/src/compiler/parseConst.cpp
+++ b/src/compiler/parseConst.cpp
@@ -38,13 +38,13 @@
     bool visitLoop(Visit visit, TIntermLoop*);
     bool visitBranch(Visit visit, TIntermBranch*);
 
-    int index;
+    size_t index;
     ConstantUnion *unionArray;
     TType type;
     TOperator constructorType;
     bool singleConstantParam;
     TInfoSink& infoSink;
-    int size; // size of the constructor ( 4 for vec4)
+    size_t size; // size of the constructor ( 4 for vec4)
     bool isDiagonalMatrixInit;
     int matrixCols; // columns of the matrix
     int matrixRows; // rows of the matrix
@@ -161,16 +161,16 @@
     }
 
     ConstantUnion* leftUnionArray = unionArray;
-    int instanceSize = type.getObjectSize();
+    size_t instanceSize = type.getObjectSize();
 
     if (index >= instanceSize)
         return;
 
     if (!singleConstantParam) {
-        int objectSize = node->getType().getObjectSize();
+        size_t objectSize = node->getType().getObjectSize();
     
         ConstantUnion *rightUnionArray = node->getUnionArrayPointer();
-        for (int i=0; i < objectSize; i++) {
+        for (size_t i=0; i < objectSize; i++) {
             if (index >= instanceSize)
                 return;
             leftUnionArray[index] = rightUnionArray[i];
@@ -178,11 +178,11 @@
             (index)++;
         }
     } else {
-        int totalSize = index + size;
+        size_t totalSize = index + size;
         ConstantUnion *rightUnionArray = node->getUnionArrayPointer();
         if (!isDiagonalMatrixInit) {
             int count = 0;
-            for (int i = index; i < totalSize; i++) {
+            for (size_t i = index; i < totalSize; i++) {
                 if (i >= instanceSize)
                     return;