little zeno steps towards building

added NIL to NULL_POINTER in upgrade script also.

diff --git a/octopi/library/tests_cromp/crompish_pax.h b/octopi/library/tests_cromp/crompish_pax.h
index 869211a12d5e7afd2d1adba6c1b1005c16fdfa45..5634e5917adf0e1240c433ef9c7d0b377e087810 100644 (file)
--- a/octopi/library/tests_cromp/crompish_pax.h
+++ b/octopi/library/tests_cromp/crompish_pax.h
@@ -39,7 +39,7 @@ public:
   : infoton(bubble_classing()), _data()
   { reset(data_segment_size, boundaries, color); }
 
-  const structures::string_array &bubble_classing() {
+  const structures::string_array &bubble_classing() const {
     static basis::astring bubbs[2] = { "bubble", "rubble" };
     static structures::string_array barray(2, bubbs);
     return barray;
@@ -61,8 +61,9 @@ public:
   int non_data_overhead() const { return packed_size() - _data.length(); }
 
   virtual void text_form(basis::base_string &to_show) const {
+    const structures::string_array bubs = bubble_classing();
     to_show.assign(basis::a_sprintf("classing=%s, seg size=%d, color=%d, bounds=%s", 
-        bubble_classing().text_form().s(), _data.length(), _bounds.text_form().s(), _color));
+        bubs.text_form().s(), _data.length(), _bounds.text_form().s(), _color));
   }
 
   virtual void pack(basis::byte_array &packed_form) const {

diff --git a/octopi/library/tests_cromp/test_cromp_client.cpp b/octopi/library/tests_cromp/test_cromp_client.cpp
index e7ced1ee9cf3a8ea51b5c7a58ec0f69edd0115c2..e7f2078450925995f2271daca52c6fc846791f75 100644 (file)
--- a/octopi/library/tests_cromp/test_cromp_client.cpp
+++ b/octopi/library/tests_cromp/test_cromp_client.cpp
@@ -21,20 +21,21 @@
 #include <application/command_line.h>
 #include <application/hoople_main.h>
 #include <cromp/cromp_client.h>
-#include <processes/ethread.h>
-#include <processes/thread_cabinet.h>
-#include <sockets/throughput_counter.h>
-#include <octopus/entity_data_bin.h>
-#include <octopus/entity_defs.h>
-#include <octopus/infoton.h>
+#include <filesystem/filename.h>
 #include <loggers/console_logger.h>
 #include <loggers/file_logger.h>
 #include <loggers/program_wide_logger.h>
-#include <filesystem/filename.h>
+#include <octopus/entity_data_bin.h>
+#include <octopus/entity_defs.h>
+#include <octopus/infoton.h>
+#include <processes/ethread.h>
+#include <processes/thread_cabinet.h>
 #include <processes/rendezvous.h>
 #include <sockets/internet_address.h>
+#include <sockets/throughput_counter.h>
 #include <structures/static_memory_gremlin.h>
 #include <structures/set.h>
+#include <timely/time_control.h>
 #include <unit_test/unit_base.h>
 
 #include <stdlib.h>
@@ -43,7 +44,7 @@ using namespace application;
 using namespace basis;
 using namespace configuration;
 using namespace cromp;
-//using namespace mathematics;
+using namespace mathematics;
 using namespace filesystem;
 using namespace loggers;
 using namespace octopi;

diff --git a/scripts/buildor/upgrade_hoople_to_feistymeow.sh b/scripts/buildor/upgrade_hoople_to_feistymeow.sh
index e9cf3f2f1c2cd6c6d7daaa3f07f57fac66217c9f..c187b5f94c4a52b65e4b9221e61da5c79f01128b 100644 (file)
--- a/scripts/buildor/upgrade_hoople_to_feistymeow.sh
+++ b/scripts/buildor/upgrade_hoople_to_feistymeow.sh
@@ -162,6 +162,7 @@ standards and usages."
     | sed -e 's/log_base::CRLF_AT_END/parser_bits::CRLF_AT_END/g' \
     | sed -e 's/^#include <mechanisms\/throughput_counter.h> *$/#include <sockets\/throughput_counter.h>/g' \
     | sed -e 's/^#include <application\/rendezvous.h> *$/#include <processes\/rendezvous.h>/g' \
+    | sed -e 's/\([[:space:]]\)*NIL\([^A-Za-z_\)/\1NULL_POINTER\2/g' \
     | sed -e 's/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/[\/]*/\/\/\/\/\/\/\/\/\/\/\/\/\/\//g' \
     >"$tempfile"