X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fnodes%2Fpackable_tree.cpp;h=831538af81aa71978a6816a0129f36bfc747b417;hb=ef338226ccf699c8d8a149d9b74e9888175c7099;hp=aa85c3756bb6f0870109e7950306885d46f29542;hpb=5a8e13e7a44ed98d9683bc6cd3bb374e9d3b0756;p=feisty_meow.git diff --git a/nucleus/library/nodes/packable_tree.cpp b/nucleus/library/nodes/packable_tree.cpp index aa85c375..831538af 100644 --- a/nucleus/library/nodes/packable_tree.cpp +++ b/nucleus/library/nodes/packable_tree.cpp @@ -130,7 +130,7 @@ throw_error(current_node->class_name(), func, "failure calculating size"); int packable_tree::recursive_packed_size() const { - packable_tree *curr = NIL; + packable_tree *curr = NULL_POINTER; int accum = 0; // where we accumulate the length of the packed form. for (iterator zip2 = start(postfix); (curr = (packable_tree *)zip2.next()); ) calcit(accum, curr); @@ -141,7 +141,7 @@ int packable_tree::recursive_packed_size() const void packable_tree::recursive_pack(byte_array &packed_form) const { - packable_tree *curr = NIL; + packable_tree *curr = NULL_POINTER; for (iterator zip2 = start(postfix); (curr = (packable_tree *)zip2.next()); ) packit(packed_form, curr); @@ -161,10 +161,10 @@ packable_tree *packable_tree::recursive_unpack(byte_array &packed_form, // get the first command out of the package. if (!cmd.unpack(packed_form)) { //complain. - return NIL; + return NULL_POINTER; } - packable_tree *new_branch = NIL; + packable_tree *new_branch = NULL_POINTER; bool failure = false; // set to true if errors occurred. // the packed tree is traversed by grabbing a command and then doing what