X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=7f2efdce93ebb30557be4b713d49125bca646da0;hb=7f29c6d2a4eee36538d7ccf24980e749592e2444;hp=bda0dd1d7b2a0d673bcea91fc1fdbab23307ce37;hpb=b006be7a2eccaeff9647b5b403d7d0a4ff13da3b;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index bda0dd1d..7f2efdce 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -181,15 +181,15 @@ void Assignment::visit(NodeVisitor &visitor)
 
 
 FunctionCall::FunctionCall():
-	declaration(0),
-	constructor(false)
+	constructor(false),
+	declaration(0)
 { }
 
 FunctionCall::FunctionCall(const FunctionCall &other):
 	name(other.name),
-	declaration(0),
 	constructor(other.constructor),
-	arguments(other.arguments)
+	arguments(other.arguments),
+	declaration(0)
 { }
 
 void FunctionCall::visit(NodeVisitor &visitor)
@@ -241,25 +241,25 @@ void StructDeclaration::visit(NodeVisitor &visitor)
 
 VariableDeclaration::VariableDeclaration():
 	constant(false),
-	type_declaration(0),
 	array(false),
+	type_declaration(0),
 	linked_declaration(0)
 { }
 
 VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
+	layout(other.layout),
 	constant(other.constant),
 	sampling(other.sampling),
 	interpolation(other.interpolation),
 	interface(other.interface),
 	precision(other.precision),
 	type(other.type),
-	type_declaration(0),
 	name(other.name),
 	array(other.array),
 	array_size(other.array_size),
 	init_expression(other.init_expression),
-	linked_declaration(0),
-	layout(other.layout)
+	type_declaration(0),
+	linked_declaration(0)
 { }
 
 VariableDeclaration::~VariableDeclaration()
@@ -310,8 +310,8 @@ FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	return_type(other.return_type),
 	name(other.name),
 	parameters(other.parameters),
-	definition(other.definition==&other ? this : 0),
-	body(other.body)
+	body(other.body),
+	definition(other.definition==&other ? this : 0)
 { }
 
 void FunctionDeclaration::visit(NodeVisitor &visitor)