Commit b2dfd8ea by alokp@chromium.org

Fix warnings about initialization order in the class initialization list. Submitted by timeless.

BUG=14 Review URL: http://codereview.appspot.com/1850054 git-svn-id: https://angleproject.googlecode.com/svn/trunk@376 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 0a57618a
...@@ -157,11 +157,12 @@ protected: ...@@ -157,11 +157,12 @@ protected:
struct tHeader { struct tHeader {
tHeader(tHeader* nextPage, size_t pageCount) : tHeader(tHeader* nextPage, size_t pageCount) :
nextPage(nextPage),
pageCount(pageCount)
#ifdef GUARD_BLOCKS #ifdef GUARD_BLOCKS
lastAllocation(0), , lastAllocation(0)
#endif #endif
nextPage(nextPage), { }
pageCount(pageCount) { }
~tHeader() { ~tHeader() {
#ifdef GUARD_BLOCKS #ifdef GUARD_BLOCKS
......
...@@ -12,23 +12,31 @@ ...@@ -12,23 +12,31 @@
// //
class TConstTraverser : public TIntermTraverser { class TConstTraverser : public TIntermTraverser {
public: public:
TConstTraverser(ConstantUnion* cUnion, bool singleConstParam, TOperator constructType, TInfoSink& sink, TSymbolTable& symTable, TType& t) : unionArray(cUnion), type(t), TConstTraverser(ConstantUnion* cUnion, bool singleConstParam, TOperator constructType, TInfoSink& sink, TSymbolTable& symTable, TType& t)
constructorType(constructType), singleConstantParam(singleConstParam), infoSink(sink), symbolTable(symTable), error(false), isMatrix(false), matrixSize(0) : error(false),
{ index(0),
index = 0; unionArray(cUnion),
} type(t),
constructorType(constructType),
singleConstantParam(singleConstParam),
infoSink(sink),
symbolTable(symTable),
size(0),
isMatrix(false),
matrixSize(0) {
}
bool error; bool error;
protected: protected:
void visitSymbol(TIntermSymbol*); void visitSymbol(TIntermSymbol*);
void visitConstantUnion(TIntermConstantUnion*); void visitConstantUnion(TIntermConstantUnion*);
bool visitBinary(Visit visit, TIntermBinary*); bool visitBinary(Visit visit, TIntermBinary*);
bool visitUnary(Visit visit, TIntermUnary*); bool visitUnary(Visit visit, TIntermUnary*);
bool visitSelection(Visit visit, TIntermSelection*); bool visitSelection(Visit visit, TIntermSelection*);
bool visitAggregate(Visit visit, TIntermAggregate*); bool visitAggregate(Visit visit, TIntermAggregate*);
bool visitLoop(Visit visit, TIntermLoop*); bool visitLoop(Visit visit, TIntermLoop*);
bool visitBranch(Visit visit, TIntermBranch*); bool visitBranch(Visit visit, TIntermBranch*);
int index; int index;
ConstantUnion *unionArray; ConstantUnion *unionArray;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment