diff options
author | Ian Romanick <[email protected]> | 2015-08-18 17:41:30 -0700 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2015-09-02 16:24:17 -0700 |
commit | 8fafb0a67faa548cb16e122e214912a17835e369 (patch) | |
tree | 78f52dd7d38f62315a964e832ae0f976c473bdc2 /src/glsl | |
parent | 06ada493fbc22e99867e14f26f1a511b343e3759 (diff) |
mesa: Fix warning about static being in the wrong place
Because the compiler already has enough things to complain about.
grep -rl 'const static' src/ | while read f
do
sed --in-place -e 's/const static/static const/g' $f
done
brw_eu_emit.c: In function 'brw_reg_type_to_hw_type':
brw_eu_emit.c:98:7: warning: 'static' is not at beginning of declaration [-Wold-style-declaration]
const static int imm_hw_types[] = {
^
brw_eu_emit.c:120:7: warning: 'static' is not at beginning of declaration [-Wold-style-declaration]
const static int hw_types[] = {
^
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r-- | src/glsl/builtin_types.cpp | 2 | ||||
-rw-r--r-- | src/glsl/ir_reader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/builtin_types.cpp b/src/glsl/builtin_types.cpp index 0d0d71d56df..0aedbb3546a 100644 --- a/src/glsl/builtin_types.cpp +++ b/src/glsl/builtin_types.cpp @@ -127,7 +127,7 @@ static const struct glsl_struct_field gl_FogParameters_fields[] = { #define T(TYPE, MIN_GL, MIN_ES) \ { glsl_type::TYPE##_type, MIN_GL, MIN_ES }, -const static struct builtin_type_versions { +static const struct builtin_type_versions { const glsl_type *const type; int min_gl; int min_es; diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp index 469837f5e4c..979653304cc 100644 --- a/src/glsl/ir_reader.cpp +++ b/src/glsl/ir_reader.cpp @@ -26,7 +26,7 @@ #include "glsl_types.h" #include "s_expression.h" -const static bool debug = false; +static const bool debug = false; namespace { |