Merge branch 'dev' of feistymeow.org:feisty_meow into dev

[feisty_meow.git] / octopi / library / tentacles / login_tentacle.cpp

diff --git a/octopi/library/tentacles/login_tentacle.cpp b/octopi/library/tentacles/login_tentacle.cpp
index 20b34e2a1da25828f5f5162b742a67ec77913157..c50e3ef44fdd59ebff0ecbb4e015bbc47050d338 100644 (file)
--- a/octopi/library/tentacles/login_tentacle.cpp
+++ b/octopi/library/tentacles/login_tentacle.cpp
@@ -48,7 +48,7 @@ outcome login_tentacle::reconstitute(const string_array &classifier,
     return NO_HANDLER;
 
   return reconstituter(classifier, packed_form, reformed,
-      (security_infoton *)NIL);
+      (security_infoton *)NULL_POINTER);
 }
 
 void login_tentacle::expunge(const octopus_entity &to_remove)
@@ -59,7 +59,7 @@ void login_tentacle::expunge(const octopus_entity &to_remove)
 outcome login_tentacle::consume(infoton &to_chow,
     const octopus_request_id &item_id, byte_array &transformed)
 {
-//  FUNCDEF("consume");
+  FUNCDEF("consume");
   transformed.reset();
   security_infoton *inf = dynamic_cast<security_infoton *>(&to_chow);
   if (!inf) {