aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/list.h
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/src/glsl/list.h')
-rwxr-xr-x[-rw-r--r--]mesalib/src/glsl/list.h38
1 files changed, 2 insertions, 36 deletions
diff --git a/mesalib/src/glsl/list.h b/mesalib/src/glsl/list.h
index fb6f0fbba..2934539fe 100644..100755
--- a/mesalib/src/glsl/list.h
+++ b/mesalib/src/glsl/list.h
@@ -76,28 +76,11 @@ struct exec_node {
struct exec_node *prev;
#ifdef __cplusplus
- /* Callers of this ralloc-based new need not call delete. It's
- * easier to just ralloc_free 'ctx' (or any of its ancestors). */
- static void* operator new(size_t size, void *ctx)
- {
- void *node;
-
- node = ralloc_size(ctx, size);
- assert(node != NULL);
-
- return node;
- }
-
- /* If the user *does* call delete, that's OK, we will just
- * ralloc_free in that case. */
+ DECLARE_RALLOC_CXX_OPERATORS(exec_node)
static void operator delete(void *node, void *ctx)
{
ralloc_free(node);
}
- static void operator delete(void *node)
- {
- ralloc_free(node);
- }
exec_node() : next(NULL), prev(NULL)
{
@@ -289,28 +272,11 @@ struct exec_list {
struct exec_node *tail_pred;
#ifdef __cplusplus
- /* Callers of this ralloc-based new need not call delete. It's
- * easier to just ralloc_free 'ctx' (or any of its ancestors). */
- static void* operator new(size_t size, void *ctx)
- {
- void *node;
-
- node = ralloc_size(ctx, size);
- assert(node != NULL);
-
- return node;
- }
-
- /* If the user *does* call delete, that's OK, we will just
- * ralloc_free in that case. */
+ DECLARE_RALLOC_CXX_OPERATORS(exec_list)
static void operator delete(void *node, void *ctx)
{
ralloc_free(node);
}
- static void operator delete(void *node)
- {
- ralloc_free(node);
- }
exec_list()
{