resolved friend monk_the_detective issues

needed to forward declare that class, and also refer to it in global
namespace as ::monk_the_detective before the friend class declaration
would properly compile.

diff --git a/octopi/library/octopus/entity_data_bin.h b/octopi/library/octopus/entity_data_bin.h
index d47761939db45c91d92bbc3854a05ab2993f3c0a..77ee741078d2747089fc23de84e2c53b7b6504b7 100644 (file)
--- a/octopi/library/octopus/entity_data_bin.h
+++ b/octopi/library/octopus/entity_data_bin.h
@@ -20,6 +20,9 @@
 #include <basis/mutex.h>
 #include <structures/set.h>
 
+// forward.
+class monk_the_detective;
+
 namespace octopi {
 
 // forward.
@@ -104,9 +107,6 @@ public:
     // note that this should be called periodically by the controlling object.
     // it will not be called automatically.
 
-  basis::base_synchronizer &locker() { return *_ent_lock; }
-    //!< provided for tighter synchronization; this should be used very carefully, e.g. with auto_synchronizer.
-
 private:
   entity_item_hash *_table;  // our main storage object.
   basis::mutex *_ent_lock;  // protects our structures.
@@ -116,7 +116,10 @@ private:
   int _max_per_ent;  // the maximum size allowed per entity.
   int _items_held;  // the number of items in residence.
 
-  friend class monk_the_detective;  // eerie supernatural powers, for testing.
+  friend class ::monk_the_detective;  // eerie supernatural powers, for testing.
+
+  basis::base_synchronizer &locker() { return *_ent_lock; }
+    //!< provided for tighter synchronization; this should be used very carefully, e.g. with auto_synchronizer.
 
   int scramble_counter();  // counts the number of items used.
 

diff --git a/octopi/library/tests_cromp/makefile b/octopi/library/tests_cromp/makefile
index 533535591e9436cd865d8ee4ccc80349390526f9..d9c95cb4b183bc8e1cadb92d6b11209b825b9e36 100644 (file)
--- a/octopi/library/tests_cromp/makefile
+++ b/octopi/library/tests_cromp/makefile
@@ -18,7 +18,11 @@ create_decoder_ring:
 
 run_client_server_test:
        # launch the server into the background first.  we have to hope it completes, eventually.
+       echo "launching the cromp server..."
        ($(FEISTY_MEOW_BINARIES)/test_cromp_server &)
+       echo "starting the cromp client..."
        $(FEISTY_MEOW_BINARIES)/test_cromp_client --sends 1008
+       echo "cromp client has finished, now zapping server..."
        # zap the server now, since it won't quit otherwise.
        killall test_cromp_server
+       echo "after cromp client & server tests."