diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-23 09:41:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-23 09:41:49 +0200 |
| commit | e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae (patch) | |
| tree | ee54f228a08b4d042e73cf9e6247ffbc9af3b73f /mesalib/src/glsl/glsl_parser_extras.h | |
| parent | 55c05b8a12944349b00053253d3a49b223a9f4de (diff) | |
| download | vcxsrv-e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae.tar.gz vcxsrv-e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae.tar.bz2 vcxsrv-e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae.zip | |
mesa xserver git update 23 Sep 2013
xserver commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b
mesa commit 6d29db715b8d60718ada1ab8ad19d969cac43caf
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 2e2440a9e..364a98345 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -73,22 +73,7 @@ struct _mesa_glsl_parse_state { _mesa_glsl_parse_state(struct gl_context *_ctx, GLenum target, void *mem_ctx); - /* 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 *mem = rzalloc_size(ctx, size); - assert(mem != NULL); - - return mem; - } - - /* If the user *does* call delete, that's OK, we will just - * ralloc_free in that case. */ - static void operator delete(void *mem) - { - ralloc_free(mem); - } + DECLARE_RZALLOC_CXX_OPERATORS(_mesa_glsl_parse_state); /** * Generate a string representing the GLSL version currently being compiled |