update against 03-Feb-2005 release

1 files changed, 2 insertions, 3 deletions

diff --git a/src/mesa/shader/slang/MachineIndependent/parseConst.cpp b/src/mesa/shader/slang/MachineIndependent/parseConst.cpp
index 6900ef75900..1ea91b3c52d 100755
--- a/src/mesa/shader/slang/MachineIndependent/parseConst.cpp
+++ b/src/mesa/shader/slang/MachineIndependent/parseConst.cpp
@@ -1,5 +1,5 @@
 //

-//Copyright (C) 2002-2004  3Dlabs Inc. Ltd.

+//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.

 //All rights reserved.

 //

 //Redistribution and use in source and binary forms, with or without

@@ -40,7 +40,7 @@
 //

 class TConstTraverser : public TIntermTraverser {

 public:

-    TConstTraverser(constUnion* cUnion, bool singleConstParam, TOperator constructType, TInfoSink& sink, TSymbolTable& symTable, TType t) : unionArray(cUnion), type(t),

+    TConstTraverser(constUnion* cUnion, bool singleConstParam, TOperator constructType, TInfoSink& sink, TSymbolTable& symTable, TType& t) : unionArray(cUnion), type(t),

         constructorType(constructType), singleConstantParam(singleConstParam), infoSink(sink), symbolTable(symTable), error(false), isMatrix(false), matrixSize(0) {  index = 0; tOp = EOpNull;}

     int index ;

     constUnion *unionArray;

@@ -174,7 +174,6 @@ bool ParseUnary(bool /* preVisit */, TIntermUnary* node, TIntermTraverser* it)
 bool ParseAggregate(bool /* preVisit */, TIntermAggregate* node, TIntermTraverser* it)

 {

     TConstTraverser* oit = static_cast<TConstTraverser*>(it);

-    TType tt = node->getType();

 

     if (!node->isConstructor() && node->getOp() != EOpComma) {

         char buf[200];