code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo...
[blender-staging.git] / source / gameengine / Expressions / IdentifierExpr.h
index bf996f5e2f050372ef1337a754b110d4f3a25e23..26eb3691378d97e2c7e03715ec541e0192f792d2 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef __IDENTIFIER_EXPR
-#define __IDENTIFIER_EXPR
+#ifndef __IDENTIFIEREXPR_H__
+#define __IDENTIFIEREXPR_H__
 
 #include "Expression.h"
 
@@ -52,11 +52,8 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIdentifierExpr"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       MEM_CXX_CLASS_ALLOC_FUNCS("GE:CIdentifierExpr")
 #endif
 };
 
-#endif //__IDENTIFIER_EXPR
-
+#endif  /* __IDENTIFIEREXPR_H__ */