From: Rob Clark <robdclark@gmail.com>
Date: Tue, 16 Feb 2016 18:31:27 +0000 (-0500)
Subject: glsl: fix new gcc6 warnings
X-Git-Tag: upstream/17.1.0~12413
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b01575ec9992783213832c4f6473e6d607a0b40b;p=platform%2Fupstream%2Fmesa.git

glsl: fix new gcc6 warnings

src/compiler/glsl/lower_discard_flow.cpp:79:1: warning: ‘ir_visitor_status {anonymous}::lower_discard_flow_visitor::visit_enter(ir_loop_jump*)’ defined but not used [-Wunused-function]
 lower_discard_flow_visitor::visit_enter(ir_loop_jump *ir)
 ^~~~~~~~~~~~~~~~~~~~~~~~~~

The base class method that was intended to be overridden was
'visit(ir_loop_jump *ir)', not visit_enter().

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/compiler/glsl/lower_discard_flow.cpp b/src/compiler/glsl/lower_discard_flow.cpp
index 9d0a56b..9e3a7c0 100644
--- a/src/compiler/glsl/lower_discard_flow.cpp
+++ b/src/compiler/glsl/lower_discard_flow.cpp
@@ -62,8 +62,8 @@ public:
    {
    }
 
+   ir_visitor_status visit(ir_loop_jump *ir);
    ir_visitor_status visit_enter(ir_discard *ir);
-   ir_visitor_status visit_enter(ir_loop_jump *ir);
    ir_visitor_status visit_enter(ir_loop *ir);
    ir_visitor_status visit_enter(ir_function_signature *ir);
 
@@ -76,7 +76,7 @@ public:
 } /* anonymous namespace */
 
 ir_visitor_status
-lower_discard_flow_visitor::visit_enter(ir_loop_jump *ir)
+lower_discard_flow_visitor::visit(ir_loop_jump *ir)
 {
    if (ir->mode != ir_loop_jump::jump_continue)
       return visit_continue;