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

1 files changed, 26 insertions, 0 deletions

diff --git a/mesalib/src/glsl/ralloc.h b/mesalib/src/glsl/ralloc.h
index 67eb93833..799d3a9b8 100644
--- a/mesalib/src/glsl/ralloc.h
+++ b/mesalib/src/glsl/ralloc.h
@@ -404,4 +404,30 @@ bool ralloc_vasprintf_append(char **str, const char *fmt, va_list args);
 } /* end of extern "C" */
 #endif
 
+#define _RALLOC_OPS(ALLOC, TYPE)                                         \
+   static void* operator new(size_t size, void *mem_ctx)                 \
+   {                                                                     \
+      void *p = ALLOC(mem_ctx, size);                                    \
+      assert(p != NULL);                                                 \
+      return p;                                                          \
+   }                                                                     \
+                                                                         \
+   static void operator delete(void *p)                                  \
+   {                                                                     \
+      ralloc_free(p);                                                    \
+   }
+
+/**
+ * Declare C++ new and delete operators which use ralloc.
+ *
+ * Placing one of these macros in the body of a class makes it possible to do:
+ *
+ * TYPE *var = new(mem_ctx) TYPE(...);
+ * delete var;
+ *
+ * which is more idiomatic in C++ than calling ralloc or rzalloc.
+ */
+#define DECLARE_RALLOC_CXX_OPERATORS(TYPE)  _RALLOC_OPS(ralloc_size,  TYPE)
+#define DECLARE_RZALLOC_CXX_OPERATORS(TYPE) _RALLOC_OPS(rzalloc_size, TYPE)
+
 #endif