Merge branch 'release-2.140.128' into main

[feisty_meow.git] / nucleus / library / tests_nodes / test_tree.cpp

diff --git a/nucleus/library/tests_nodes/test_tree.cpp b/nucleus/library/tests_nodes/test_tree.cpp
index 5d3516ce6be5fb1df92352a47ff40084386f1172..d0b0a4343f4e290665d104a02b99f3b98102137c 100644 (file)
--- a/nucleus/library/tests_nodes/test_tree.cpp
+++ b/nucleus/library/tests_nodes/test_tree.cpp
@@ -1,15 +1,14 @@
 /*
-*  Name   : test_tree                                                         *
-*  Author : Chris Koeritz                                                     *
-*  Purpose:                                                                   *
-*    Tests out the tree class.                                                *
+*  Name   : test_tree
+*  Author : Chris Koeritz
+*  Purpose: Tests out the tree class.
 **
-* Copyright (c) 1993-$now By Author.  This program is free software; you can  *
-* redistribute it and/or modify it under the terms of the GNU General Public  *
-* License as published by the Free Software Foundation; either version 2 of   *
-* the License or (at your option) any later version.  This is online at:      *
-*     http://www.fsf.org/copyleft/gpl.html                                    *
-* Please send any updates to: fred@gruntose.com                               *
+* Copyright (c) 1993-$now By Author.  This program is free software; you can
+* redistribute it and/or modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either version 2 of
+* the License or (at your option) any later version.  This is online at:
+*     http://www.fsf.org/copyleft/gpl.html
+* Please send any updates to: fred@gruntose.com
 */
 
 #include <application/hoople_main.h>
@@ -37,7 +36,7 @@ const int test_iterations = 20;
 class bogotre : public packable, public tree
 {
 public:
-  bogotre(const char *start = NIL) : who_cares(42), i_sure_dont('l'),
+  bogotre(const char *start = NULL_POINTER) : who_cares(42), i_sure_dont('l'),
         another_useless_int(23) {
     astring to_init(start);
     if (to_init.length() < 1) to_init += "ack";
@@ -152,7 +151,7 @@ larch *test_tree::next(larch *&move, larch *formal(hook), traveller &skip)
 void test_tree::apply(larch *apply_to, applier *to_apply,
     tree::traversal_directions order)
 {
-  larch *curr = NIL;
+  larch *curr = NULL_POINTER;
   for (traveller skippy = apply_to->start(order);
        next(curr, apply_to, skippy); ) to_apply(curr);
 }