diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 23:40:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 23:42:09 +0100 |
| commit | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (patch) | |
| tree | ba0af42750f0ab6dc4724342a7063835636222b5 /mesalib/src/glsl/ir_clone.cpp | |
| parent | 87e58a93f7248171e736656080069cb65ff56aae (diff) | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.gz vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.bz2 vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Diffstat (limited to 'mesalib/src/glsl/ir_clone.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_clone.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp index 5c7279ca3..914e0e4d5 100644 --- a/mesalib/src/glsl/ir_clone.cpp +++ b/mesalib/src/glsl/ir_clone.cpp @@ -158,7 +158,7 @@ ir_call::clone(void *mem_ctx, struct hash_table *ht) const ir_expression * ir_expression::clone(void *mem_ctx, struct hash_table *ht) const { - ir_rvalue *op[Elements(this->operands)] = { NULL, }; + ir_rvalue *op[ARRAY_SIZE(this->operands)] = { NULL, }; unsigned int i; for (i = 0; i < get_num_operands(); i++) { |