diff options
| author | Conley Owens <cco3@android.com> | 2011-12-28 16:18:24 -0800 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2011-12-28 16:25:50 -0800 |
| commit | 4f054616c70eb5bb1eb711d5bdf6f4c71ac3b877 (patch) | |
| tree | b57fb26b399dc8fd29dcfd2450b944ecc8f2ecde | |
| parent | c976701adf344808694880ef3a5c86133d74df2c (diff) | |
| download | mesa3d-4f054616c70eb5bb1eb711d5bdf6f4c71ac3b877.tar.gz | |
Fix warnings/errors specific to gcc 4.6.1
* Deal with hidden overloaded functions
* Explicit include of cstddef where necessary
Change-Id: I6e72685feb11b23b3573416f7f643b5f6dff03ab
| -rw-r--r-- | src/glsl/ir_basic_block.cpp | 1 | ||||
| -rw-r--r-- | src/glsl/ir_visitor.h | 1 | ||||
| -rw-r--r-- | src/glsl/linker.cpp | 6 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/glsl/ir_basic_block.cpp b/src/glsl/ir_basic_block.cpp index a8338259620..25741815969 100644 --- a/src/glsl/ir_basic_block.cpp +++ b/src/glsl/ir_basic_block.cpp @@ -39,6 +39,7 @@ public: has_call = false; } + using ir_hierarchical_visitor::visit_enter; virtual ir_visitor_status visit_enter(ir_call *ir) { (void) ir; diff --git a/src/glsl/ir_visitor.h b/src/glsl/ir_visitor.h index 7dd35fe1dc3..cf7950ddf0b 100644 --- a/src/glsl/ir_visitor.h +++ b/src/glsl/ir_visitor.h @@ -69,6 +69,7 @@ public: */ class ir_control_flow_visitor : public ir_visitor { public: + using ir_visitor::visit; virtual void visit(class ir_variable *) {} virtual void visit(class ir_expression *) {} virtual void visit(class ir_texture *) {} diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index f8b69627175..d77b6a36015 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -63,6 +63,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ +#include <cstddef> #include <cstdlib> #include <cstdio> #include <cstdarg> @@ -107,6 +108,7 @@ public: return visit_continue_with_parent; } + using ir_hierarchical_visitor::visit_enter; virtual ir_visitor_status visit_enter(ir_call *ir) { exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator(); @@ -150,6 +152,7 @@ public: /* empty */ } + using ir_hierarchical_visitor::visit; virtual ir_visitor_status visit(ir_dereference_variable *ir) { if (strcmp(this->name, ir->var->name) == 0) { @@ -620,6 +623,7 @@ remap_variables(ir_instruction *inst, struct gl_shader *target, this->temps = temps; } + using ir_hierarchical_visitor::visit; virtual ir_visitor_status visit(ir_dereference_variable *ir) { if (ir->var->mode == ir_var_temporary) { @@ -1762,4 +1766,4 @@ done: } //hieralloc_free(mem_ctx); -}
\ No newline at end of file +} |