Mon Jul 31 18:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

20 files changed, 71 insertions, 65 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8bfb07181d6..ed2c667990a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,26 @@
+Mon Jul 31 18:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Containers_T.{h,cpp}:
+        * Hash_Map_Manager_T.{h,cpp}:
+        * Map_Manager.{h,inl}:
+        * Node.{h,cpp}:
+          Removed check for !ACE_HAS_BROKEN_NOOP_DTORS, this define is
+          not in any config file
+
+        * config-unixware-7.1.0.udk.h:
+          Removed commented out define
+
+        * Token_Collection.{h,cpp}:
+        * Token_Manager.{h,inl}:
+          Changed debug flag to be a bool
+
+        * SOCK_Dgram_Bcast.h
+        * TP_Reactor.h
+        * Signal.h
+        * Thread.h
+        * Thread_Adapter.h
+          Documentation updates
+
 Mon Jul 31 14:57:08 UTC 2006  Steve Huston  <shuston@riverace.com>
 
         * apps/Makefile.am: Removed hard-coded inclusion of gperf in the
diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp
index e5558650ad3..0dd3bfbf160 100644
--- a/ACE/ace/Containers_T.cpp
+++ b/ACE/ace/Containers_T.cpp
@@ -1454,12 +1454,10 @@ ACE_DNode<T>::ACE_DNode (const T &i, ACE_DNode<T> *n, ACE_DNode<T> *p)
 {
 }
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
 template <class T>
 ACE_DNode<T>::~ACE_DNode (void)
 {
 }
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 // ****************************************************************
 
diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h
index e34a0bf781e..b14872c7203 100644
--- a/ACE/ace/Containers_T.h
+++ b/ACE/ace/Containers_T.h
@@ -315,10 +315,8 @@ class ACE_DNode
 
 public:
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
   /// This isn't necessary, but it keeps some compilers happy.
   ~ACE_DNode (void);
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 private:
 
diff --git a/ACE/ace/Hash_Map_Manager_T.cpp b/ACE/ace/Hash_Map_Manager_T.cpp
index ce1b33b33a9..9a80270b8d8 100644
--- a/ACE/ace/Hash_Map_Manager_T.cpp
+++ b/ACE/ace/Hash_Map_Manager_T.cpp
@@ -50,12 +50,10 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Map_Entry (const EXT_ID &ext_id,
 {
 }
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
 template <class EXT_ID, class INT_ID>
 ACE_Hash_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Map_Entry (void)
 {
 }
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 template <class EXT_ID, class INT_ID> EXT_ID &
 ACE_Hash_Map_Entry<EXT_ID, INT_ID>::key ()
diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h
index 2f496ea107a..35b9028e962 100644
--- a/ACE/ace/Hash_Map_Manager_T.h
+++ b/ACE/ace/Hash_Map_Manager_T.h
@@ -46,10 +46,8 @@ public:
   ACE_Hash_Map_Entry (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *next,
                       ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev);
 
-  # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
   /// Destructor.
   ~ACE_Hash_Map_Entry (void);
-  #endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
   /// Key accessor.
   EXT_ID& key (void);
@@ -153,7 +151,7 @@ public:
 
   // = Initialization and termination methods.
 
-  /** 
+  /**
    * Initialize a @c Hash_Map_Manager_Ex with default size elements.
    * @param table_alloc is a pointer to a memory allocator used for
    *        table_, so it should supply size*sizeof (ACE_Hash_Map_Entry<EXT_ID, INT_ID>).
@@ -167,7 +165,7 @@ public:
   ACE_Hash_Map_Manager_Ex (ACE_Allocator *table_alloc = 0,
                            ACE_Allocator *entry_alloc = 0);
 
-  /** 
+  /**
    * Initialize a @c Hash_Map_Manager_Ex with @c size elements.
    * @param table_alloc is a pointer to a memory allocator used for
    *        table_, so it should supply size*sizeof (ACE_Hash_Map_Entry<EXT_ID, INT_ID>).
@@ -182,7 +180,7 @@ public:
                            ACE_Allocator *table_alloc = 0,
                            ACE_Allocator *entry_alloc = 0);
 
-  /** 
+  /**
    * Initialize a @c Hash_Map_Manager_Ex with @c size elements.
    * @param table_alloc is a pointer to a memory allocator used for
    *        table_, so it should supply size*sizeof (ACE_Hash_Map_Entry<EXT_ID, INT_ID>).
diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h
index b4722c34864..cc92a385c53 100644
--- a/ACE/ace/Map_Manager.h
+++ b/ACE/ace/Map_Manager.h
@@ -39,11 +39,9 @@ template <class EXT_ID, class INT_ID>
 class ACE_Map_Entry
 {
 public:
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
   /// We need this destructor to keep some compilers from complaining.
   /// It's just a no-op, however.
   ~ACE_Map_Entry (void);
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
   /// Key used to look up an entry.
   EXT_ID ext_id_;
diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl
index c40a72d79f1..493d6c6a5c1 100644
--- a/ACE/ace/Map_Manager.inl
+++ b/ACE/ace/Map_Manager.inl
@@ -7,13 +7,11 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
 template <class EXT_ID, class INT_ID> ACE_INLINE
 ACE_Map_Entry<EXT_ID, INT_ID>::~ACE_Map_Entry (void)
 {
   // No-op just to keep some compilers happy...
 }
-#endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 template <class EXT_ID, class INT_ID> ACE_INLINE ACE_UINT32
 ACE_Map_Entry<EXT_ID, INT_ID>::next (void) const
diff --git a/ACE/ace/Node.cpp b/ACE/ace/Node.cpp
index 8976a9c379e..3520a8a0c6b 100644
--- a/ACE/ace/Node.cpp
+++ b/ACE/ace/Node.cpp
@@ -13,12 +13,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Node)
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
-  template <class T>
+template <class T>
 ACE_Node<T>::~ACE_Node (void)
 {
 }
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 template <class T>
 ACE_Node<T>::ACE_Node (const T &i, ACE_Node<T> *n)
diff --git a/ACE/ace/Node.h b/ACE/ace/Node.h
index 6ec514d8141..b6b98b13235 100644
--- a/ACE/ace/Node.h
+++ b/ACE/ace/Node.h
@@ -51,10 +51,8 @@ public:
   friend class ACE_Unbounded_Stack<T>;
   friend class ACE_Unbounded_Stack_Iterator<T>;
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
   /// This isn't necessary, but it keeps some compilers happy.
   ~ACE_Node (void);
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 private:
   // = Initialization methods
diff --git a/ACE/ace/SOCK_Dgram_Bcast.h b/ACE/ace/SOCK_Dgram_Bcast.h
index de0c80cb9e9..880a9b266de 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.h
+++ b/ACE/ace/SOCK_Dgram_Bcast.h
@@ -89,7 +89,7 @@ public:
                 u_short portnum,
                 int flags = 0) const;
 
-  /// Broadcast the <iovec> datagrams to every interface.  Returns the
+  /// Broadcast the @c iov datagrams to every interface.  Returns the
   /// average number of bytes sent.
   ssize_t send (const iovec iov[],
                 int n,
diff --git a/ACE/ace/Sig_Adapter.h b/ACE/ace/Sig_Adapter.h
index c784fedb48b..bd8f089fb63 100644
--- a/ACE/ace/Sig_Adapter.h
+++ b/ACE/ace/Sig_Adapter.h
@@ -30,7 +30,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @class ACE_Sig_Adapter
  *
  * @brief Provide an adapter that transforms various types of signal
- * handlers into the scheme used by the <ACE_Reactor>.
+ * handlers into the scheme used by the ACE_Reactor.
  */
 class ACE_Export ACE_Sig_Adapter : public ACE_Event_Handler
 {
@@ -41,7 +41,7 @@ public:
   ~ACE_Sig_Adapter (void);
 
   /// Returns this signal key that's used to remove this from the
-  /// <ACE_Reactor>'s internal table.
+  /// ACE_Reactor's internal table.
   int sigkey (void);
 
   /// Called by the <Reactor> to dispatch the signal handler.
diff --git a/ACE/ace/Signal.h b/ACE/ace/Signal.h
index 0cfcdcfc98d..4e386a56361 100644
--- a/ACE/ace/Signal.h
+++ b/ACE/ace/Signal.h
@@ -95,7 +95,7 @@ private:
 /**
  * @class ACE_Sig_Action
  *
- * @brief C++ wrapper facade for the <sigaction> struct.
+ * @brief C++ wrapper facade for the @c sigaction struct.
  */
 class ACE_Export ACE_Sig_Action
 {
@@ -180,12 +180,12 @@ public:
   int register_action (int signum,
                        ACE_Sig_Action *oaction = 0);
 
-  /// Assign the value of <oaction> to <this> and make it become the
+  /// Assign the value of @a oaction to @c this and make it become the
   /// new signal disposition.
   int restore_action (int signum,
                       ACE_Sig_Action &oaction);
 
-  /// Retrieve the current disposition into <this>.
+  /// Retrieve the current disposition into @c this.
   int retrieve_action (int signum);
 
   /// Set current signal action.
diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h
index 5c39225c1e7..b4e21f236eb 100644
--- a/ACE/ace/TP_Reactor.h
+++ b/ACE/ace/TP_Reactor.h
@@ -185,9 +185,9 @@ public:
   /**
    * Initialize the ACE_TP_Reactor to manage
    * @a max_number_of_handles.  If @a restart is non-0 then the
-   * ACE_Reactor's <handle_events> method will be restarted
-   * automatically when <EINTR> occurs.  If <signal_handler> or
-   * <timer_queue> are non-0 they are used as the signal handler and
+   * ACE_Reactor's @c handle_events() method will be restarted
+   * automatically when @c EINTR occurs.  If @a sh or
+   * @a tq are non-0 they are used as the signal handler and
    * timer queue, respectively.
    */
   ACE_TP_Reactor (size_t max_number_of_handles,
@@ -200,20 +200,20 @@ public:
   // = Event loop drivers.
 
   /**
-   * This event loop driver that blocks for <max_wait_time> before
+   * This event loop driver that blocks for @a max_wait_time before
    * returning.  It will return earlier if timer events, I/O events,
-   * or signal events occur.  Note that <max_wait_time> can be 0, in
+   * or signal events occur.  Note that @a max_wait_time can be 0, in
    * which case this method blocks indefinitely until events occur.
    *
-   * <max_wait_time> is decremented to reflect how much time this call
+   * @a max_wait_time is decremented to reflect how much time this call
    * took.  For instance, if a time value of 3 seconds is passed to
    * handle_events and an event occurs after 2 seconds,
-   * <max_wait_time> will equal 1 second.  This can be used if an
+   * @a max_wait_time will equal 1 second.  This can be used if an
    * application wishes to handle events for some fixed amount of
    * time.
    *
    * Returns the total number of ACE_Event_Handlers that were
-   * dispatched, 0 if the <max_wait_time> elapsed without dispatching
+   * dispatched, 0 if the @a max_wait_time elapsed without dispatching
    * any handlers, or -1 if something goes wrong.
    */
   virtual int handle_events (ACE_Time_Value *max_wait_time = 0);
diff --git a/ACE/ace/Thread.h b/ACE/ace/Thread.h
index ba1b9d64a57..36295bb9925 100644
--- a/ACE/ace/Thread.h
+++ b/ACE/ace/Thread.h
@@ -92,15 +92,15 @@ public:
                     ACE_Thread_Adapter *thread_adapter = 0);
 
   /**
-   * Spawn N new threads, which execute <func> with argument <arg> (if
-   * <thread_adapter> is non-0 then <func> and <args> are ignored and
-   * are obtained from <thread_adapter>).  If <stack> != 0 it is
-   * assumed to be an array of <n> pointers to the base of the stacks
-   * to use for the threads being spawned.  Likewise, if <stack_size>
-   * != 0 it is assumed to be an array of <n> values indicating how
+   * Spawn N new threads, which execute @a func with argument @a arg (if
+   * @a thread_adapter is non-0 then @a func and @a args are ignored and
+   * are obtained from @a thread_adapter).  If @a stack != 0 it is
+   * assumed to be an array of @a n pointers to the base of the stacks
+   * to use for the threads being spawned.  Likewise, if @a stack_size
+   * != 0 it is assumed to be an array of @a n values indicating how
    * big each of the corresponding <stack>s are.  Returns the number
    * of threads actually spawned (if this doesn't equal the number
-   * requested then something has gone wrong and <errno> will
+   * requested then something has gone wrong and @c errno will
    * explain...).
    *
    * @see spawn()
@@ -158,7 +158,8 @@ public:
    * @param status    Points to the location that receives the joined
    *                  thread's exit value. If @a status is 0, it is ignored.
    *
-   * @retval  0 for success; -1 (with errno set) for failure.
+   * @retval  0 for success
+   * @retval  -1 (with errno set) for failure.
    */
   static int join (ACE_thread_t thread_id,
                    ACE_thread_t *departed,
@@ -216,7 +217,7 @@ public:
                          sigset_t *osigset = 0);
 
   /**
-   * Allocates a <keyp> that is used to identify data that is specific
+   * Allocates a @a keyp that is used to identify data that is specific
    * to each thread in the process.  The key is global to all threads
    * in the process.
    */
@@ -231,13 +232,13 @@ public:
   /// Free up the key so that other threads can reuse it.
   static int keyfree (ACE_thread_key_t key);
 
-  /// Bind value to the thread-specific data key, <key>, for the calling
+  /// Bind value to the thread-specific data key, @a key, for the calling
   /// thread.
   static int setspecific (ACE_thread_key_t key,
                           void *value);
 
-  /// Stores the current value bound to <key> for the calling thread
-  /// into the location pointed to by <valuep>.
+  /// Stores the current value bound to @a key for the calling thread
+  /// into the location pointed to by @a valuep.
   static int getspecific (ACE_thread_key_t key,
                           void **valuep);
 
@@ -253,9 +254,9 @@ public:
                              struct cancel_state *old_state);
 
   /**
-   * Cancel a thread.  Note that this method is only portable on
-   * platforms, such as POSIX pthreads, that support thread
-   * cancellation.
+   * Cancel a thread.
+   * @note This method is only portable on platforms, such as POSIX pthreads,
+   * that support thread cancellation.
    */
   static int cancel (ACE_thread_t t_id);
 
diff --git a/ACE/ace/Thread_Adapter.h b/ACE/ace/Thread_Adapter.h
index 046d21b238f..599ba645fd0 100644
--- a/ACE/ace/Thread_Adapter.h
+++ b/ACE/ace/Thread_Adapter.h
@@ -65,7 +65,7 @@ public:
    */
   virtual ACE_THR_FUNC_RETURN invoke (void);
 
-  /// Accessor for the optional <Thread_Manager>.
+  /// Accessor for the optional ACE_Thread_Manager.
   ACE_Thread_Manager *thr_mgr (void);
 
 protected:
diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp
index 7356844165e..97c919565b9 100644
--- a/ACE/ace/Token_Collection.cpp
+++ b/ACE/ace/Token_Collection.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (ace,
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Token_Collection::ACE_Token_Collection (int debug,
+ACE_Token_Collection::ACE_Token_Collection (bool debug,
                                             const ACE_TCHAR *name)
 : debug_ (debug)
 {
diff --git a/ACE/ace/Token_Collection.h b/ACE/ace/Token_Collection.h
index 0d57cc0ca58..9dc5aa522ca 100644
--- a/ACE/ace/Token_Collection.h
+++ b/ACE/ace/Token_Collection.h
@@ -52,21 +52,21 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * ACE_Token_Collection allows individual operations on single
  * members of a collection of Token_Proxies.  This provides a
  * single access point for operations on multiple tokens.
+ *
+ * @bug Although ACE_Token_Collection inherits from ACE_Token_Proxy, it
+ * can not be including in a collection.  This is because <clone>
+ * returns zero for now.
+ *
  */
 class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy
 {
-
-  // = BUGS
-  //   Although ACE_Token_Collection inherits from ACE_Token_Proxy, it
-  //   can not be including in a collection.  This is because <clone>
-  //   returns zero for now.
 public:
   /**
    * @a debug print out verbose debugging messages. @a name will give a
    * name to the collection.  Collections don't really need names, but
    * are sometimes useful for debugging.
    */
-  ACE_Token_Collection (int debug = 0,
+  ACE_Token_Collection (bool debug = false,
                         const ACE_TCHAR *name = 0);
 
 // Collection Management operations
@@ -86,7 +86,7 @@ public:
   int insert (ACE_Token_Proxy &token);
 
   /**
-   * removes the ACE_Token matching the given token_name from the
+   * Removes the ACE_Token matching the given token_name from the
    * collection.  On success, extract returns 0. On failure
    * (token_name was not in the collection,) extract returns -1.  On
    * success, the state of the token found is copied into proxy.
@@ -94,7 +94,7 @@ public:
    */
   int extract (const ACE_TCHAR *token_name, ACE_Token_Proxy *&proxy);
 
-  /// returns the proxy if true.  0 otherwise.
+  /// Returns the proxy if true.  0 otherwise.
   ACE_Token_Proxy *is_member (const ACE_TCHAR *token_name);
 
   /**
@@ -220,7 +220,7 @@ protected:
   COLLECTION collection_;
 
   /// Whether to print out debug messages or not.
-  int debug_;
+  bool debug_;
 
   /// Name of the collection.
   ACE_TCHAR name_[ACE_MAXTOKENNAMELEN];
diff --git a/ACE/ace/Token_Manager.h b/ACE/ace/Token_Manager.h
index 63c78712203..3a1cfdf6c72 100644
--- a/ACE/ace/Token_Manager.h
+++ b/ACE/ace/Token_Manager.h
@@ -98,11 +98,11 @@ public:
   void dump (void) const;
 
   /// Turn debug mode on/off.
-  void debug (int d);
+  void debug (bool d);
 
 private:
   /// Whether to print debug messages or not.
-  int debug_;
+  bool debug_;
 
   /// pointer to singleton token manager.
   static ACE_Token_Manager *token_manager_;
diff --git a/ACE/ace/Token_Manager.inl b/ACE/ace/Token_Manager.inl
index b38c4b9e346..b779b57b9de 100644
--- a/ACE/ace/Token_Manager.inl
+++ b/ACE/ace/Token_Manager.inl
@@ -14,7 +14,7 @@ ACE_Token_Manager::mutex (void)
 }
 
 ACE_INLINE void
-ACE_Token_Manager::debug (int d)
+ACE_Token_Manager::debug (bool d)
 {
   ACE_TRACE ("ACE_Token_Manager::debug");
   debug_ = d;
diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h
index f449152026d..549db4416dd 100644
--- a/ACE/ace/config-unixware-7.1.0.udk.h
+++ b/ACE/ace/config-unixware-7.1.0.udk.h
@@ -12,8 +12,6 @@
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 
-/* For unixware 7.1 && g++ 2.91.57, see if this fixes my problem */
-//#define ACE_HAS_BROKEN_NOOP_DTORS
 #ifndef UNIXWARE_7_1
 #define UNIXWARE_7_1
 #endif