ChangeLogTag:Tue Jul 10 06:06:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

11 files changed, 78 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 01239f200f7..1418c10cecb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Jul 10 06:06:07 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Service_Repository.h: Updated the insert() comment to
+	  clarify the return values.  Thanks to Johnny Willemsen for
+ 	  suggesting this.
+
+	* ace/Service_Repository.{h,i}: Made the current_size() and
+	  total_size() methods const.  Thanks to Johnny Willemsen for
+ 	  suggesting this.
+
+	* ace/Service_Repository.h: Fixed a typo in the comments.  Thanks
+	  to Johnny Willemsen for reporting this.
+
 Tue Jul 10 08:39:04 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/config-vxworks5.x.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 01239f200f7..1418c10cecb 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Tue Jul 10 06:06:07 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Service_Repository.h: Updated the insert() comment to
+	  clarify the return values.  Thanks to Johnny Willemsen for
+ 	  suggesting this.
+
+	* ace/Service_Repository.{h,i}: Made the current_size() and
+	  total_size() methods const.  Thanks to Johnny Willemsen for
+ 	  suggesting this.
+
+	* ace/Service_Repository.h: Fixed a typo in the comments.  Thanks
+	  to Johnny Willemsen for reporting this.
+
 Tue Jul 10 08:39:04 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/config-vxworks5.x.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 01239f200f7..1418c10cecb 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Tue Jul 10 06:06:07 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Service_Repository.h: Updated the insert() comment to
+	  clarify the return values.  Thanks to Johnny Willemsen for
+ 	  suggesting this.
+
+	* ace/Service_Repository.{h,i}: Made the current_size() and
+	  total_size() methods const.  Thanks to Johnny Willemsen for
+ 	  suggesting this.
+
+	* ace/Service_Repository.h: Fixed a typo in the comments.  Thanks
+	  to Johnny Willemsen for reporting this.
+
 Tue Jul 10 08:39:04 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/config-vxworks5.x.h:
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index ee9119dc245..d5d244ffc6e 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,13 +1,27 @@
+Tue Jul 10 05:52:09 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* tao/Profile.h,
+	* tao/Object.h: Fixed typos in comments.  Thanks to Johnny
+	  Willemsen for reporting this.
+
+	* tao/Connector_Registry.h (TAO_Connector_Registry): Fixed a typo
+	  where svc.comf should have been svc.conf.  Thanks to Johnny
+ 	  Willemsen for reporting this.
+
+	* tao/ORB.cpp: Added an addition expression to the #ifdef for the
+	  using std::set_unexpected declaration.  Thanks to Scott Plant
+ 	  <splant@softhome.net> for reporting this.
+
 Tue Jul 10 00:45:00 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tao/RTCORBA/RT_ORB.cpp (TAO_RT_CORBA_Priority_Normalizer):
 
 	  Fixed busted code that did not check if the resolved
-	  PriorityMappingManager object reference was nil.  Since this
-	  check was missing, a seg fault would occur when attempting to
-	  invoke a method on that mapping manager.  Throw a
-	  CORBA::INTERNAL() exception if the reference is nil.  This at
-	  leasts lets us identify a problem without seg faulting.
+ 	  PriorityMappingManager object reference was nil.  Since this
+ 	  check was missing, a seg fault would occur when attempting to
+ 	  invoke a method on that mapping manager.  Throw a
+ 	  CORBA::INTERNAL() exception if the reference is nil.  This at
+ 	  leasts lets us identify a problem without seg faulting.
 
 	  Fixed broken code that did not use emulated exceptions properly.
 	  The ACE_TRY/CATCH block was missing.
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index b276f243aae..d9ffdc92fee 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -51,7 +51,7 @@ typedef TAO_Connector** TAO_ConnectorSetIterator;
  * This class is able to dynamically load a set of
  * concrete protocol connectors which have registered with the service
  * configurator and added their Factory name to the Resource_Factory
- * line of the svc.comf file.
+ * line of the svc.conf file.
  */
 class TAO_Export TAO_Connector_Registry
 {
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 0c0efbaf6db..8134ad973fa 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -53,7 +53,8 @@
 # else
 #  if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
 #   include /**/ <exception>
-#   if !defined (_MSC_VER)
+#   if !defined (_MSC_VER) && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
+                                      (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) 
 using std::set_unexpected;
 #   endif /* !_MSC_VER */
 #  else
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 19d0f7b145c..c5f2998c831 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -37,19 +37,19 @@ class TAO_Abstract_ServantBase;
 class TAO_Export CORBA_Object
 {
 public:
-  /// destructor
+  /// Destructor.
   virtual ~CORBA_Object (void);
 
-  /// address of this variable used in _unchecked_narrow
+  /// Address of this variable used in <_unchecked_narrow>.
   static int _tao_class_id;
 
-  /// increment the ref count
+  /// Increment the ref count.
   static CORBA_Object_ptr _duplicate (CORBA_Object_ptr obj);
 
-  /// return a NUL object
+  /// Return a NULL object.
   static CORBA_Object_ptr _nil (void);
 
-  /// no-op it is just here to simplify some templates.
+  /// No-op it is just here to simplify some templates.
   ACE_INLINE_FOR_GNUC
   static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj,
                                    CORBA_Environment &ACE_TRY_ENV =
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 2a17c887dba..aec9ce39d85 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_PROFILE_H
 #define TAO_PROFILE_H
 #include "ace/pre.h"
@@ -57,7 +56,7 @@ public:
   /// maintains ownership.
   const TAO_GIOP_Message_Version &version (void) const;
 
-  /// Get a poiter to the TAO_ORB_Core
+  /// Get a pointer to the <TAO_ORB_Core>.
   TAO_ORB_Core *orb_core (void) const;
 
   /// Increase the reference count by one on this object.
diff --git a/THANKS b/THANKS
index d1f1d12d6f1..2adc92ac1ee 100644
--- a/THANKS
+++ b/THANKS
@@ -1288,6 +1288,8 @@ Mouna Seri <seri@crhc.uiuc.edu>
 Vladimir Chovanec <Vladimir.CHOVANEC@asset.sk>
 Alexander Rieger <Alexander.Rieger@inka.de>
 Glen Coakley <gcoakley@mqsoftware.com>
+Scott Plant <splant@softhome.net>
+Wilfried Reinoehl <Wilfried.Reinoehl@WiredMinds.de>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h
index 73d9685b662..0cce9684fad 100644
--- a/ace/Service_Repository.h
+++ b/ace/Service_Repository.h
@@ -65,7 +65,7 @@ public:
   /// resources.
   int close (void);
 
-  /// Finalize all the services by calling <fini> and deleteing
+  /// Finalize all the services by calling <fini> and deleting
   /// dynamically allocated services.
   int fini (void);
 
@@ -81,7 +81,8 @@ public:
 
   // = Search structure operations (all acquire locks as necessary).
 
-  /// Insert a new service record.
+  /// Insert a new service record.  Returns -1 when the service repository is full
+  /// and 0 on success.
   int insert (const ACE_Service_Type *);
 
   /**
@@ -107,10 +108,10 @@ public:
   int suspend (const ACE_TCHAR[], const ACE_Service_Type ** = 0);
 
   /// Return the current size of the repository.
-  int current_size (void);
+  int current_size (void) const;
 
   /// Return the total size of the repository.
-  int total_size (void);
+  int total_size (void) const;
 
   /// Dump the state of an object.
   void dump (void) const;
diff --git a/ace/Service_Repository.i b/ace/Service_Repository.i
index 5ba6a04e0fe..053ff2673a8 100644
--- a/ace/Service_Repository.i
+++ b/ace/Service_Repository.i
@@ -7,10 +7,10 @@
 // both resumed and suspended entries).
 
 ACE_INLINE int
-ACE_Service_Repository::current_size (void)
+ACE_Service_Repository::current_size (void) const
 {
   ACE_TRACE ("ACE_Service_Repository::current_size");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1));
   return this->current_size_;
 }
 
@@ -18,10 +18,10 @@ ACE_Service_Repository::current_size (void)
 // table.
 
 ACE_INLINE int
-ACE_Service_Repository::total_size (void)
+ACE_Service_Repository::total_size (void) const
 {
   ACE_TRACE ("ACE_Service_Repository::total_size");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1));
   return this->total_size_;
 }