summaryrefslogtreecommitdiff
path: root/src/glsl/glsl_symbol_table.cpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-01-15 15:25:02 -0800
committerKenneth Graunke <kenneth@whitecape.org>2011-01-19 23:40:33 -0800
commit21031b4e887a4bd5563130d54a11972b69cb2645 (patch)
treee516fcb75b4792607a6cb0edffa83d398e602dfb /src/glsl/glsl_symbol_table.cpp
parentc116a0e2dcce7635707fab724cfe4f6bc23906e3 (diff)
glsl: Don't bother unsetting a destructor that was never set.
This was totally copied and pasted from glsl_symbol_table.
Diffstat (limited to 'src/glsl/glsl_symbol_table.cpp')
-rw-r--r--src/glsl/glsl_symbol_table.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/glsl/glsl_symbol_table.cpp b/src/glsl/glsl_symbol_table.cpp
index 3dcd928016..6fcfe07b9c 100644
--- a/src/glsl/glsl_symbol_table.cpp
+++ b/src/glsl/glsl_symbol_table.cpp
@@ -35,13 +35,10 @@ public:
return entry;
}
- /* If the user *does* call delete, that's OK, we will just
- * talloc_free in that case. Here, C++ will have already called the
- * destructor so tell talloc not to do that again. */
- static void operator delete(void *table)
+ /* If the user *does* call delete, that's OK, we will just talloc_free. */
+ static void operator delete(void *entry)
{
- talloc_set_destructor(table, NULL);
- talloc_free(table);
+ talloc_free(entry);
}
symbol_table_entry(ir_variable *v) : v(v), f(0), t(0) {}