ChangeLogTag: Thu May 22 07:09:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 42 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index dd5e655156e..95d147a3784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu May 22 07:51:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-vxworks5.x.h:
+          Added defines ACE_HAS_STRPTIME and ACE_LACKS_NATIVE_STRPTIME
+
+        * ace/config-win32-mingw.h:
+          Added define ACE_HAS_STRPTIME
+
+        * ace/Token_Collection.h:
+        * ace/Token_Invariants.h:
+        * ace/Token_Manager.h:
+          Doxygen documentation fixes.
+
 Wed May 21 19:55:54 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	  Thanks to Tongzhe Cui <tonycui@yahoo.com> for motivating the
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 60ecf8270e6..9bc1bf69dbc 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -69,19 +69,20 @@ public:
 
 // Collection Management operations
 
+  /**
+   * Insert a Token into the collection.  All ACE_Token type
+   * operations performed on the collection will also be performed on
+   * the new_proxy until it is removed.  Note that no operations
+   * performed prior to the insertion will be performed.  Returns: 0
+   * on success, -1 on failure with <errno> == problem.  If a token
+   * proxy already exists in the collection with the same name, the
+   * insertion will fail.  Also, <token> is copied.  Note that during
+   * the copy, client_id's are *not* inherited.  The client ID of the
+   * thread using the collection will be used.  Client ID's can be
+   * changed explicity on each proxy using is_member.
+   */
   int insert (ACE_Token_Proxy &token);
 
-  // Insert a Token into the collection.  All ACE_Token type
-  // operations performed on the collection will also be performed on
-  // the new_proxy until it is removed.  Note that no operations
-  // performed prior to the insertion will be performed.  Returns: 0
-  // on success, -1 on failure with <errno> == problem.  If a token
-  // proxy already exists in the collection with the same name, the
-  // insertion will fail.  Also, <token> is copied.  Note that during
-  // the copy, client_id's are *not* inherited.  The client ID of the
-  // thread using the collection will be used.  Client ID's can be
-  // changed explicity on each proxy using is_member.
-
   /**
    * removes the ACE_Token matching the given token_name from the
    * collection.  On success, extract returns 0. On failure
@@ -203,15 +204,13 @@ protected:
 
   /// Allows iterations through collection_
   /**
-   * @note Deprecated typedef.  Use COLLECTION::ITERATOR trait
-   *       instead.
+   * @deprecated Deprecated typedef.  Use COLLECTION::ITERATOR trait instead.
    */
   typedef COLLECTION::ITERATOR COLLECTION_ITERATOR;
 
   /// Allows iterations through collection_
   /**
-   * @note Deprecated typedef.  Use COLLECTION::ENTRY trait
-   *       instead.
+   * @deprecated Deprecated typedef.  Use COLLECTION::ENTRY trait instead.
    */
   typedef COLLECTION::ENTRY COLLECTION_ENTRY;
 
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index 84372a731a5..3b63cce6a46 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -194,15 +194,15 @@ protected:
 
   /// Allows iterations through collection.
   /**
-   * @note Deprecated typedef.  Use MUTEX_COLLECTION::ITERATOR trait
-   *       instead.
+   * @deprecated Deprecated typedef.  Use MUTEX_COLLECTION::ITERATOR trait
+   * instead.
    */
   typedef MUTEX_COLLECTION::ITERATOR MUTEX_COLLECTION_ITERATOR;
 
   /// Allows iterations through collection.
   /**
-   * @note Deprecated typedef.  Use MUTEX_COLLECTION::ENTRY trait
-   *       instead.
+   * @deprecated Deprecated typedef.  Use MUTEX_COLLECTION::ENTRY trait
+   * instead.
    */
   typedef MUTEX_COLLECTION::ENTRY MUTEX_COLLECTION_ENTRY;
 
@@ -215,15 +215,15 @@ protected:
 
   /// Allows iterations through collection.
   /**
-   * @note Deprecated typedef.  Use RWLOCK_COLLECTION::ITERATOR trait
-   *       instead.
+   * @deprecated Deprecated typedef.  Use RWLOCK_COLLECTION::ITERATOR trait
+   * instead.
    */
   typedef RWLOCK_COLLECTION::ITERATOR RWLOCK_COLLECTION_ITERATOR;
 
   /// Allows iterations through collection.
   /**
-   * @note Deprecated typedef.  Use RWLOCK_COLLECTION::ENTRY trait
-   *       instead.
+   * @deprecated Deprecated typedef.  Use RWLOCK_COLLECTION::ENTRY trait
+   * instead.
    */
   typedef RWLOCK_COLLECTION::ENTRY RWLOCK_COLLECTION_ENTRY;
 
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index 15b17624b40..857c533679c 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -118,15 +118,15 @@ private:
 
   /// Allows iterations through collection_
   /**
-   * @note Deprecated typedef.  Use COLLECTION::ITERATOR trait
-   *       instead.
+   * @deprecated Deprecated typedef.  Use COLLECTION::ITERATOR trait
+   * instead.
    */
   typedef COLLECTION::ITERATOR COLLECTION_ITERATOR;
 
   /// Allows iterations through collection_
   /**
-   * @note Deprecated typedef.  Use COLLECTION::ENTRY trait
-   *       instead.
+   * @deprecated Deprecated typedef.  Use COLLECTION::ENTRY trait
+   * instead.
    */
   typedef COLLECTION::ENTRY COLLECTION_ENTRY;
 
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index fefff467ebf..da67214da25 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -122,6 +122,7 @@
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_TSS_EMULATION
+#define ACE_HAS_STRPTIME
 #define ACE_LACKS_ACCESS
 #define ACE_LACKS_COND_T
 #define ACE_LACKS_EXEC
@@ -169,6 +170,7 @@
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_UNIX_SIGNALS
 #define ACE_LACKS_UTSNAME_T
+#define ACE_LACKS_NATIVE_STRPTIME
 #define ACE_PAGE_SIZE 4096
 #define ACE_THR_PRI_FIFO_DEF 101
 #define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h
index 2655f3a4feb..e415d0074bb 100644
--- a/ace/config-win32-mingw.h
+++ b/ace/config-win32-mingw.h
@@ -41,6 +41,7 @@
 
 #define ACE_LACKS_STRRECVFD
 #define ACE_HAS_STRERROR
+#define ACE_HAS_STRPTIME
 
 // We trust the user: He must have used -mpentiumpro or -mpentium
 // if that is what he wants.