From e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 23 Sep 2013 09:41:49 +0200 Subject: mesa xserver git update 23 Sep 2013 xserver commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b mesa commit 6d29db715b8d60718ada1ab8ad19d969cac43caf --- mesalib/src/glsl/ast.h | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) (limited to 'mesalib/src/glsl/ast.h') diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h index 1c7fc63ac..c3361a106 100644 --- a/mesalib/src/glsl/ast.h +++ b/mesalib/src/glsl/ast.h @@ -49,24 +49,7 @@ struct YYLTYPE; */ class ast_node { public: - /* 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 = rzalloc_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. */ - static void operator delete(void *table) - { - ralloc_free(table); - } + DECLARE_RZALLOC_CXX_OPERATORS(ast_node); /** * Print an AST node in something approximating the original GLSL code @@ -363,24 +346,7 @@ enum { }; struct ast_type_qualifier { - /* 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 = rzalloc_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. */ - static void operator delete(void *table) - { - ralloc_free(table); - } + DECLARE_RZALLOC_CXX_OPERATORS(ast_type_qualifier); union { struct { -- cgit v1.2.3