Cleanup: use new c++ guarded allocator API

API added in rBa3ad5abf2fe85d623f9e78fefc34e27bdc14632e

3 files changed, 25 insertions, 33 deletions

diff --git a/source/blender/nodes/intern/node_common.cc b/source/blender/nodes/intern/node_common.cc
index a1fccc401a4..05b85ca7fdc 100644
--- a/source/blender/nodes/intern/node_common.cc
+++ b/source/blender/nodes/intern/node_common.cc
@@ -224,7 +224,7 @@ void node_group_update(struct bNodeTree *ntree, struct bNode *node)
 
 static void node_frame_init(bNodeTree *UNUSED(ntree), bNode *node)
 {
-  NodeFrame *data = (NodeFrame *)MEM_callocN(sizeof(NodeFrame), "frame node storage");
+  NodeFrame *data = MEM_cnew<NodeFrame>("frame node storage");
   node->storage = data;
 
   data->flag |= NODE_FRAME_SHRINK;
@@ -235,7 +235,7 @@ static void node_frame_init(bNodeTree *UNUSED(ntree), bNode *node)
 void register_node_type_frame(void)
 {
   /* frame type is used for all tree types, needs dynamic allocation */
-  bNodeType *ntype = (bNodeType *)MEM_callocN(sizeof(bNodeType), "frame node type");
+  bNodeType *ntype = MEM_cnew<bNodeType>("frame node type");
   ntype->free_self = (void (*)(bNodeType *))MEM_freeN;
 
   node_type_base(ntype, NODE_FRAME, "Frame", NODE_CLASS_LAYOUT, NODE_BACKGROUND);
@@ -264,7 +264,7 @@ static void node_reroute_init(bNodeTree *ntree, bNode *node)
 void register_node_type_reroute(void)
 {
   /* frame type is used for all tree types, needs dynamic allocation */
-  bNodeType *ntype = (bNodeType *)MEM_callocN(sizeof(bNodeType), "frame node type");
+  bNodeType *ntype = MEM_cnew<bNodeType>("frame node type");
   ntype->free_self = (void (*)(bNodeType *))MEM_freeN;
 
   node_type_base(ntype, NODE_REROUTE, "Reroute", NODE_CLASS_LAYOUT, 0);
@@ -454,7 +454,7 @@ void node_group_input_update(bNodeTree *ntree, bNode *node)
     }
 
     if (link->fromsock == extsock) {
-      bNodeLink *tlink = (bNodeLink *)MEM_callocN(sizeof(bNodeLink), "temporary link");
+      bNodeLink *tlink = MEM_cnew<bNodeLink>("temporary link");
       *tlink = *link;
       BLI_addtail(&tmplinks, tlink);
 
@@ -505,7 +505,7 @@ void node_group_input_update(bNodeTree *ntree, bNode *node)
 void register_node_type_group_input(void)
 {
   /* used for all tree types, needs dynamic allocation */
-  bNodeType *ntype = (bNodeType *)MEM_callocN(sizeof(bNodeType), "node type");
+  bNodeType *ntype = MEM_cnew<bNodeType>("node type");
   ntype->free_self = (void (*)(bNodeType *))MEM_freeN;
 
   node_type_base(ntype, NODE_GROUP_INPUT, "Group Input", NODE_CLASS_INTERFACE, 0);
@@ -551,7 +551,7 @@ void node_group_output_update(bNodeTree *ntree, bNode *node)
     }
 
     if (link->tosock == extsock) {
-      bNodeLink *tlink = (bNodeLink *)MEM_callocN(sizeof(bNodeLink), "temporary link");
+      bNodeLink *tlink = MEM_cnew<bNodeLink>("temporary link");
       *tlink = *link;
       BLI_addtail(&tmplinks, tlink);
 
@@ -603,7 +603,7 @@ void node_group_output_update(bNodeTree *ntree, bNode *node)
 void register_node_type_group_output(void)
 {
   /* used for all tree types, needs dynamic allocation */
-  bNodeType *ntype = (bNodeType *)MEM_callocN(sizeof(bNodeType), "node type");
+  bNodeType *ntype = MEM_cnew<bNodeType>("node type");
   ntype->free_self = (void (*)(bNodeType *))MEM_freeN;
 
   node_type_base(ntype, NODE_GROUP_OUTPUT, "Group Output", NODE_CLASS_INTERFACE, 0);
diff --git a/source/blender/nodes/intern/node_exec.cc b/source/blender/nodes/intern/node_exec.cc
index f5b64f8499c..4ff662036c3 100644
--- a/source/blender/nodes/intern/node_exec.cc
+++ b/source/blender/nodes/intern/node_exec.cc
@@ -177,7 +177,7 @@ bNodeTreeExec *ntree_exec_begin(bNodeExecContext *context,
   ntreeGetDependencyList(ntree, &nodelist, &totnodes);
 
   /* XXX could let callbacks do this for specialized data */
-  exec = (bNodeTreeExec *)MEM_callocN(sizeof(bNodeTreeExec), "node tree execution data");
+  exec = MEM_cnew<bNodeTreeExec>("node tree execution data");
   /* backpointer to node tree */
   exec->nodetree = ntree;
 
@@ -292,7 +292,7 @@ bNodeThreadStack *ntreeGetThreadStack(bNodeTreeExec *exec, int thread)
   }
 
   if (!nts) {
-    nts = (bNodeThreadStack *)MEM_callocN(sizeof(bNodeThreadStack), "bNodeThreadStack");
+    nts = MEM_cnew<bNodeThreadStack>("bNodeThreadStack");
     nts->stack = (bNodeStack *)MEM_dupallocN(exec->stack);
     nts->used = true;
     BLI_addtail(lb, nts);
diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc
index 46cb9dcf891..8e2d7e7ebe9 100644
--- a/source/blender/nodes/intern/node_socket.cc
+++ b/source/blender/nodes/intern/node_socket.cc
@@ -309,8 +309,7 @@ void node_socket_init_default_value(bNodeSocket *sock)
 
   switch (type) {
     case SOCK_FLOAT: {
-      bNodeSocketValueFloat *dval = (bNodeSocketValueFloat *)MEM_callocN(
-          sizeof(bNodeSocketValueFloat), "node socket value float");
+      bNodeSocketValueFloat *dval = MEM_cnew<bNodeSocketValueFloat>("node socket value float");
       dval->subtype = subtype;
       dval->value = 0.0f;
       dval->min = -FLT_MAX;
@@ -320,8 +319,7 @@ void node_socket_init_default_value(bNodeSocket *sock)
       break;
     }
     case SOCK_INT: {
-      bNodeSocketValueInt *dval = (bNodeSocketValueInt *)MEM_callocN(sizeof(bNodeSocketValueInt),
-                                                                     "node socket value int");
+      bNodeSocketValueInt *dval = MEM_cnew<bNodeSocketValueInt>("node socket value int");
       dval->subtype = subtype;
       dval->value = 0;
       dval->min = INT_MIN;
@@ -331,8 +329,7 @@ void node_socket_init_default_value(bNodeSocket *sock)
       break;
     }
     case SOCK_BOOLEAN: {
-      bNodeSocketValueBoolean *dval = (bNodeSocketValueBoolean *)MEM_callocN(
-          sizeof(bNodeSocketValueBoolean), "node socket value bool");
+      bNodeSocketValueBoolean *dval = MEM_cnew<bNodeSocketValueBoolean>("node socket value bool");
       dval->value = false;
 
       sock->default_value = dval;
@@ -340,8 +337,7 @@ void node_socket_init_default_value(bNodeSocket *sock)
     }
     case SOCK_VECTOR: {
       static float default_value[] = {0.0f, 0.0f, 0.0f};
-      bNodeSocketValueVector *dval = (bNodeSocketValueVector *)MEM_callocN(
-          sizeof(bNodeSocketValueVector), "node socket value vector");
+      bNodeSocketValueVector *dval = MEM_cnew<bNodeSocketValueVector>("node socket value vector");
       dval->subtype = subtype;
       copy_v3_v3(dval->value, default_value);
       dval->min = -FLT_MAX;
@@ -352,16 +348,14 @@ void node_socket_init_default_value(bNodeSocket *sock)
     }
     case SOCK_RGBA: {
       static float default_value[] = {0.0f, 0.0f, 0.0f, 1.0f};
-      bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA *)MEM_callocN(
-          sizeof(bNodeSocketValueRGBA), "node socket value color");
+      bNodeSocketValueRGBA *dval = MEM_cnew<bNodeSocketValueRGBA>("node socket value color");
       copy_v4_v4(dval->value, default_value);
 
       sock->default_value = dval;
       break;
     }
     case SOCK_STRING: {
-      bNodeSocketValueString *dval = (bNodeSocketValueString *)MEM_callocN(
-          sizeof(bNodeSocketValueString), "node socket value string");
+      bNodeSocketValueString *dval = MEM_cnew<bNodeSocketValueString>("node socket value string");
       dval->subtype = subtype;
       dval->value[0] = '\0';
 
@@ -369,40 +363,38 @@ void node_socket_init_default_value(bNodeSocket *sock)
       break;
     }
     case SOCK_OBJECT: {
-      bNodeSocketValueObject *dval = (bNodeSocketValueObject *)MEM_callocN(
-          sizeof(bNodeSocketValueObject), "node socket value object");
+      bNodeSocketValueObject *dval = MEM_cnew<bNodeSocketValueObject>("node socket value object");
       dval->value = nullptr;
 
       sock->default_value = dval;
       break;
     }
     case SOCK_IMAGE: {
-      bNodeSocketValueImage *dval = (bNodeSocketValueImage *)MEM_callocN(
-          sizeof(bNodeSocketValueImage), "node socket value image");
+      bNodeSocketValueImage *dval = MEM_cnew<bNodeSocketValueImage>("node socket value image");
       dval->value = nullptr;
 
       sock->default_value = dval;
       break;
     }
     case SOCK_COLLECTION: {
-      bNodeSocketValueCollection *dval = (bNodeSocketValueCollection *)MEM_callocN(
-          sizeof(bNodeSocketValueCollection), "node socket value object");
+      bNodeSocketValueCollection *dval = MEM_cnew<bNodeSocketValueCollection>(
+          "node socket value object");
       dval->value = nullptr;
 
       sock->default_value = dval;
       break;
     }
     case SOCK_TEXTURE: {
-      bNodeSocketValueTexture *dval = (bNodeSocketValueTexture *)MEM_callocN(
-          sizeof(bNodeSocketValueTexture), "node socket value texture");
+      bNodeSocketValueTexture *dval = MEM_cnew<bNodeSocketValueTexture>(
+          "node socket value texture");
       dval->value = nullptr;
 
       sock->default_value = dval;
       break;
     }
     case SOCK_MATERIAL: {
-      bNodeSocketValueMaterial *dval = (bNodeSocketValueMaterial *)MEM_callocN(
-          sizeof(bNodeSocketValueMaterial), "node socket value material");
+      bNodeSocketValueMaterial *dval = MEM_cnew<bNodeSocketValueMaterial>(
+          "node socket value material");
       dval->value = nullptr;
 
       sock->default_value = dval;
@@ -637,7 +629,7 @@ static bNodeSocketType *make_standard_socket_type(int type, int subtype)
   bNodeSocketType *stype;
   StructRNA *srna;
 
-  stype = (bNodeSocketType *)MEM_callocN(sizeof(bNodeSocketType), "node socket C type");
+  stype = MEM_cnew<bNodeSocketType>("node socket C type");
   stype->free_self = (void (*)(bNodeSocketType * stype)) MEM_freeN;
   BLI_strncpy(stype->idname, socket_idname, sizeof(stype->idname));
   BLI_strncpy(stype->label, socket_label, sizeof(stype->label));
@@ -681,7 +673,7 @@ static bNodeSocketType *make_socket_type_virtual()
   bNodeSocketType *stype;
   StructRNA *srna;
 
-  stype = (bNodeSocketType *)MEM_callocN(sizeof(bNodeSocketType), "node socket C type");
+  stype = MEM_cnew<bNodeSocketType>("node socket C type");
   stype->free_self = (void (*)(bNodeSocketType * stype)) MEM_freeN;
   BLI_strncpy(stype->idname, socket_idname, sizeof(stype->idname));