From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sat, 15 Jan 2011 23:25:02 +0000 (-0800)
Subject: glsl: Don't bother unsetting a destructor that was never set.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=21031b4e887a4bd5563130d54a11972b69cb2645;p=mesa.git

glsl: Don't bother unsetting a destructor that was never set.

This was totally copied and pasted from glsl_symbol_table.
---

diff --git a/src/glsl/glsl_symbol_table.cpp b/src/glsl/glsl_symbol_table.cpp
index 3dcd928016a..6fcfe07b9c2 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) {}