assig reslt of realloc

csound · Dec 1, 2017 · 4c89572 · 4c89572
1 parent 176508f
commit 4c89572
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/Engine/csound_orc_semantics.c b/Engine/csound_orc_semantics.c
@@ -254,12 +254,9 @@ char* get_arg_type2(CSOUND* csound, TREE* tree, TYPE_TABLE* typeTable)
         else {
           char* rightArgType = get_arg_string_from_tree(csound, tree->right,
                                                         typeTable);
-<<<<<<< HEAD
-
+
           leftArgType =csound->ReAlloc(csound, leftArgType, strlen(leftArgType) + strlen(rightArgType) + 1);
-=======
->>>>>>> a08b70fa0eb00f177c2afa705944abc2b4f7aa6b
-          char* argString = strcat(leftArgType, rightArgType);
+char* argString = strcat(leftArgType, rightArgType);
 
           OENTRIES* opentries = find_opcode2(csound, "##array_get");
           char* outype = resolve_opcode_get_outarg(csound,