diff options
author | marha <marha@users.sourceforge.net> | 2013-09-23 09:49:27 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-23 09:49:27 +0200 |
commit | b299d73bb416e2a26a642a54d5a15ea9fa30df33 (patch) | |
tree | 4cff827d4348e99d516ee2f1051f92ad5fa3ef8d /mesalib/src/glsl/ir_function_detect_recursion.cpp | |
parent | a5179a42a3376f0d8c1d01456235b044854d8bdc (diff) | |
parent | e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae (diff) | |
download | vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.tar.gz vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.tar.bz2 vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver git update 23 Sep 2013
Conflicts:
mesalib/src/glsl/ast.h
mesalib/src/glsl/glsl_parser_extras.h
mesalib/src/glsl/glsl_symbol_table.cpp
mesalib/src/glsl/ir_constant_expression.cpp
mesalib/src/glsl/list.h
Diffstat (limited to 'mesalib/src/glsl/ir_function_detect_recursion.cpp')
-rw-r--r-- | mesalib/src/glsl/ir_function_detect_recursion.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/mesalib/src/glsl/ir_function_detect_recursion.cpp b/mesalib/src/glsl/ir_function_detect_recursion.cpp index 280c4734a..b02c32518 100644 --- a/mesalib/src/glsl/ir_function_detect_recursion.cpp +++ b/mesalib/src/glsl/ir_function_detect_recursion.cpp @@ -139,25 +139,7 @@ public: /* empty */ } - - /* 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. */ - static void operator delete(void *node) - { - ralloc_free(node); - } + DECLARE_RALLOC_CXX_OPERATORS(function) ir_function_signature *sig; |