Merge branch 'master' into terencehill/translated_keys

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / oo.qh

diff --git a/qcsrc/lib/oo.qh b/qcsrc/lib/oo.qh
index e482d7d9ac9b1afab49ae9279ced927e0aa5ce4e..9abeb1bcce330e1e20ede401e5e624c2d0370eae 100644 (file)
--- a/qcsrc/lib/oo.qh
+++ b/qcsrc/lib/oo.qh
@@ -56,11 +56,11 @@ entity __spawn(string _classname, string _sourceLoc, bool pure)
 #ifndef QCC_SUPPORT_ENTITYCLASS
        #define entityclass_2(name, base) USING(name, entity)
        #define classfield(name)
-       #define _new(class, pure) __spawn( #class, __FILE__ ":" STR(__LINE__), pure)
+       #define _new(class, pure) __spawn(#class, __FILE__ ":" STR(__LINE__), pure)
 #else
        #define entityclass_2(name, base) entityclass name : base {}
        #define classfield(name) [[class(name)]]
-       #define _new(class, pure) ((class) __spawn( #class, __FILE__ ":" STR(__LINE__), pure))
+       #define _new(class, pure) ((class) __spawn(#class, __FILE__ ":" STR(__LINE__), pure))
 #endif
 /** entities you care about seeing (.origin works) */
 #define new(class) _new(class, false)
@@ -75,13 +75,13 @@ ACCUMULATE void ONREMOVE(entity this) {}
 #endif
 
 .void(entity this) dtor;
-#define delete(this) MACRO_BEGIN { \
+#define delete(this) MACRO_BEGIN \
     entity _this = (this); \
     void(entity) _dtor = _this.dtor; \
     ONREMOVE(this); \
     if (_dtor) _dtor(_this); else delete_fn(_this); \
     /* this = NULL; */  \
-} MACRO_END
+MACRO_END
 
 entity _clearentity_ent;
 STATIC_INIT(clearentity)