*** empty log message ***

5 files changed, 42 insertions, 31 deletions

diff --git a/TAO/README b/TAO/README
index fcb9174fcb2..dbca2441c84 100644
--- a/TAO/README
+++ b/TAO/README
@@ -5,32 +5,45 @@ more information on TAO.
 
 The current alpha release of TAO contains the following:
 
-* An optimized ORB Core based on ACE components;
+* An ORB Core based on ACE components and an optimized version of
+  the SunSoft IIOP protocol engine;
 
 * An implementation of a Basic Object Adapter (BOA);
 
-* Various sample applications illustrating how to use the ORB in its
-  current state.
+* Various tests illustrating how to use TAO in its current state.
 
-This release of TAO does not yet contain the following:
+We've gotten TAO to interoperate with other ORBs (e.g., Orbix and
+Visigenic), so we're confident that the implementation of IIOP is
+robust.  However, this alpha release of TAO does not yet contain the
+following:
 
-* An IDL compiler
+* An IDL compiler;
 
-* An real-time version of the new Portable Object Adapter (POA)
+* An real-time version of the new Portable Object Adapter (POA);
 
-* The real-time scheduling service
+* The real-time scheduling service.
 
-We plan to release these features throughout the summer of 1997.
+We're currently working on these features and we plan to release them
+throughout the summer of 1997.  Please note that no amount of proding
+will get them out any faster, unless you are willing to contribute
+time and/or $$$ to the effort.
 
 Please feel free to experiment with, dissect, repair, use, etc., TAO.
 We gratefully accept bug reports, appreciate bug fixes/enhancements,
 and will strive to integrate correct bug fixes quickly!  Just remember
 that TAO does not provide all the features of a commercial ORB at the
-moment.  Moreover, key components in TAO (e.g., the Object Adapter)
-will change substantially over the summer.  Thus, any development
-performed in the interim will require additional effort (e.g., writing
-stubs and skeletons by hand), and applications may need to be
-re-written to work with new features in the forthcoming releases.
-
-Douglas C. Schmidt
-schmidt@cs.wustl.edu
+moment.
+
+Key components in TAO (e.g., the Object Adapter) will change
+substantially over the summer.  Thus, any development performed in the
+interim will require additional effort (e.g., writing stubs and
+skeletons by hand), and applications may need to be re-written to work
+with new features in the forthcoming releases.
+
+If you have any questions, please post them to the ACE mailing list
+(ace-users@cs.wustl.edu) until we get a TAO mailing list established.
+
+Thanks,
+
+	Douglas C. Schmidt
+	schmidt@cs.wustl.edu
diff --git a/TAO/tao/objtable.cpp b/TAO/tao/objtable.cpp
index 32111dcdcca..099074012ac 100644
--- a/TAO/tao/objtable.cpp
+++ b/TAO/tao/objtable.cpp
@@ -1,16 +1,18 @@
 #include "objtable.h"
 
 // Template Specialization for char*
-int ACE_Hash_Map_Manager<const char*, CORBA_Object_ptr,ACE_SYNCH_RW_MUTEX>::equal(const char* const&id1,
-												                                  const char* const&id2)
+int 
+ACE_Hash_Map_Manager<const char *, CORBA_Object_ptr, ACE_SYNCH_RW_MUTEX>::equal (const char *const &id1,
+												                                  const char *const &id2)
 {
-   return strcmp(id1, id2) == 0;
+  return ACE_OS::strcmp (id1, id2) == 0;
 }
 
-// Template Specialization for char*
-size_t ACE_Hash_Map_Manager<const char*, CORBA_Object_ptr,ACE_SYNCH_RW_MUTEX>::hash(const char* const&ext_id)
+// Template Specialization for char *
+u_long
+ACE_Hash_Map_Manager<const char *, CORBA_Object_ptr, ACE_SYNCH_RW_MUTEX>::hash (const char *const &ext_id)
 {
-   return ACE::hash_pjw (ext_id);
+  return ACE::hash_pjw (ext_id);
 }
 
 TAO_Dynamic_Hash_ObjTable::TAO_Dynamic_Hash_ObjTable (CORBA_ULong size)
@@ -74,6 +76,7 @@ TAO_Linear_ObjTable::bind (const CORBA_OctetSeq &key,
       this->next_++;
       return 0;
     }
+
   return -1; // error
 }
 
@@ -81,8 +84,6 @@ int
 TAO_Linear_ObjTable::find (const CORBA_OctetSeq &key,
 			   CORBA_Object_ptr &obj)
 {
-
-
   ACE_ASSERT (this->next_ <= this->tablesize_);
 
   for (CORBA_ULong i = 0;
@@ -97,14 +98,14 @@ TAO_Linear_ObjTable::find (const CORBA_OctetSeq &key,
   return -1;  // not found
 }
 
-TAO_Linear_ObjTable_Entry::TAO_Linear_ObjTable_Entry(void)
+TAO_Linear_ObjTable_Entry::TAO_Linear_ObjTable_Entry (void)
 {
   this->key.buffer = 0;
   this->key.length = this->key.maximum = 0;
   this->obj = 0;
 }
 
-TAO_Linear_ObjTable_Entry::~TAO_Linear_ObjTable_Entry ()
+TAO_Linear_ObjTable_Entry::~TAO_Linear_ObjTable_Entry (void)
 {
   delete [] this->key.buffer;
   this->key.length = this->key.maximum = 0;
diff --git a/TAO/tao/objtable.h b/TAO/tao/objtable.h
index d3a7902bcf5..cd2819fcfd0 100644
--- a/TAO/tao/objtable.h
+++ b/TAO/tao/objtable.h
@@ -13,8 +13,6 @@
 // 
 // ============================================================================
 
-// @@ Can you please document all the methods and classes in this file?
-
 #if !defined (TAO_OBJTABLE_H)
 #  define TAO_OBJTABLE_H
 
diff --git a/TAO/tao/optable.cpp b/TAO/tao/optable.cpp
index d78817b8a47..3411957a6cc 100644
--- a/TAO/tao/optable.cpp
+++ b/TAO/tao/optable.cpp
@@ -154,7 +154,8 @@ TAO_Operation_Table_Parameters::lookup_strategy (TAO_Operation_Table_Parameters:
   this->type_ = s;
 }
 
-TAO_Operation_Table_Parameters::DEMUX_STRATEGY TAO_Operation_Table_Parameters::lookup_strategy (void) const
+TAO_Operation_Table_Parameters::DEMUX_STRATEGY 
+TAO_Operation_Table_Parameters::lookup_strategy (void) const
 {
   return this->type_;
 }
diff --git a/TAO/tao/optable.h b/TAO/tao/optable.h
index 74b51176d5a..2adda361197 100644
--- a/TAO/tao/optable.h
+++ b/TAO/tao/optable.h
@@ -13,8 +13,6 @@
 // 
 // ============================================================================
 
-// @@ Can you please comment all the classes and methods in the file?
-
 #if !defined (TAO_OPTABLE_H)
 #define TAO_OPTABLE_H