X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Ffilter%2Ffilter-visitor-generate-ir.cpp;h=1bfe66c6f0d5010d71c2d8fe02f774f5eb5744a7;hb=f149493493fbd8a3efa4748832c03278c96c38ca;hp=3705ce4f283453ed190e4f9d75bdca02bdc2d6ca;hpb=e8c94936ad41942f158a9f77456ab1aeb4924e9c;p=lttng-tools.git

diff --git a/src/common/filter/filter-visitor-generate-ir.cpp b/src/common/filter/filter-visitor-generate-ir.cpp
index 3705ce4f2..1bfe66c6f 100644
--- a/src/common/filter/filter-visitor-generate-ir.cpp
+++ b/src/common/filter/filter-visitor-generate-ir.cpp
@@ -14,13 +14,13 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include "filter-ast.h"
+#include "filter-ast.hpp"
 #include "filter-parser.hpp"
-#include "filter-ir.h"
+#include "filter-ir.hpp"
 
-#include <common/compat/errno.h>
-#include <common/macros.h>
-#include <common/string-utils/string-utils.h>
+#include <common/compat/errno.hpp>
+#include <common/macros.hpp>
+#include <common/string-utils/string-utils.hpp>
 
 static
 struct ir_op *generate_ir_recursive(struct filter_parser_ctx *ctx,
@@ -31,7 +31,7 @@ struct ir_op *make_op_root(struct ir_op *child, enum ir_side side)
 {
 	struct ir_op *op;
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	switch (child->data_type) {
@@ -80,7 +80,7 @@ struct ir_op *make_op_load_string(const char *string, enum ir_side side)
 {
 	struct ir_op *op;
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	op->op = IR_OP_LOAD;
@@ -101,7 +101,7 @@ struct ir_op *make_op_load_numeric(int64_t v, enum ir_side side)
 {
 	struct ir_op *op;
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	op->op = IR_OP_LOAD;
@@ -118,7 +118,7 @@ struct ir_op *make_op_load_float(double v, enum ir_side side)
 {
 	struct ir_op *op;
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	op->op = IR_OP_LOAD;
@@ -192,12 +192,12 @@ struct ir_load_expression *create_load_expression(struct filter_node *node)
 	node = load_expression_get_forward_chain(node);
 	if (!node)
 		return NULL;
-	load_exp = (ir_load_expression *) zmalloc(sizeof(struct ir_load_expression));
+	load_exp = zmalloc<ir_load_expression>();
 	if (!load_exp)
 		return NULL;
 
 	/* Root */
-	load_exp_op = (ir_load_expression_op *) zmalloc(sizeof(struct ir_load_expression_op));
+	load_exp_op = zmalloc<ir_load_expression_op>();
 	if (!load_exp_op)
 		goto error;
 	load_exp->child = load_exp_op;
@@ -229,7 +229,7 @@ struct ir_load_expression *create_load_expression(struct filter_node *node)
 		struct filter_node *bracket_node;
 
 		prev_op = load_exp_op;
-		load_exp_op = (ir_load_expression_op *) zmalloc(sizeof(struct ir_load_expression_op));
+		load_exp_op = zmalloc<ir_load_expression_op>();
 		if (!load_exp_op)
 			goto error;
 		prev_op->next = load_exp_op;
@@ -248,7 +248,7 @@ struct ir_load_expression *create_load_expression(struct filter_node *node)
 					fprintf(stderr, "[error] Expecting constant index in array expression\n");
 					goto error;
 				}
-			load_exp_op = (ir_load_expression_op *) zmalloc(sizeof(struct ir_load_expression_op));
+			load_exp_op = zmalloc<ir_load_expression_op>();
 			if (!load_exp_op)
 				goto error;
 			prev_op->next = load_exp_op;
@@ -263,7 +263,7 @@ struct ir_load_expression *create_load_expression(struct filter_node *node)
 	}
 	/* Add final load field */
 	prev_op = load_exp_op;
-	load_exp_op = (ir_load_expression_op *) zmalloc(sizeof(struct ir_load_expression_op));
+	load_exp_op = zmalloc<ir_load_expression_op>();
 	if (!load_exp_op)
 		goto error;
 	prev_op->next = load_exp_op;
@@ -281,7 +281,7 @@ struct ir_op *make_op_load_expression(struct filter_node *node,
 {
 	struct ir_op *op;
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	op->op = IR_OP_LOAD;
@@ -312,7 +312,7 @@ struct ir_op *make_op_unary(enum unary_op_type unary_op_type,
 		goto error;
 	}
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	op->op = IR_OP_UNARY;
@@ -380,7 +380,7 @@ struct ir_op *make_op_binary_compare(enum op_type bin_op_type,
 		goto error;
 	}
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	op->op = IR_OP_BINARY;
@@ -461,7 +461,7 @@ struct ir_op *make_op_binary_logical(enum op_type bin_op_type,
 		goto error;
 	}
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	op->op = IR_OP_LOGICAL;
@@ -505,7 +505,7 @@ struct ir_op *make_op_binary_bitwise(enum op_type bin_op_type,
 		goto error;
 	}
 
-	op = (ir_op *) zmalloc(sizeof(struct ir_op));
+	op = zmalloc<ir_op>();
 	if (!op)
 		return NULL;
 	op->op = IR_OP_BINARY;