ChangeLogTag:Tue Jul 24 07:45:03 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

10 files changed, 90 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 263937e8953..06416479646 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Tue Jul 24 07:45:03 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Containers_T: Fixed some problems with the lack of 
+	  const for the ACE_DLList and ACE_Double_Linked_List classes.
+  	  Thanks to Michael Kircher for reporting this.
+
+	* ace/config-cygwin32-common.h: Removed the ACE_LACKS_FORK
+	  macro since this is apparently working on Cygwin.  Thanks tj
+ 	  Stefan Kluehspies <Stefan.Kluehspies@gmx.net> for reporting
+ 	  this.
+
+	* ace/config-cygwin32.h: Removed the #define _CLOCKID_T
+	  macro, which should now be handled by the following change.
+
+	* ace/OS.h: Added a #defined for _CLOCKID_T_.  Thanks to
+	  Stefan Kluehspies <Stefan.Kluehspies@gmx.net> for
+	  reporting this.
+
 Tue Jul 24 11:10:59 2001  Krishnakumar B  <kitty@cs.wustl.edu>
 
 	* ace/OS.h:
@@ -16,9 +34,9 @@ Tue Jul 24 10:04:52 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/INET_Addr.cpp:
 
-          Corrected a run-time error on Tru64 with gcc.  Any executable that
-          called ACE_INET_Addr::get_host_name() would core dump.  This was
-          caused by the call to ACE_OS::gethostbyaddr_r().
+          Corrected a run-time error on Tru64 with gcc.  Any executable
+ 	  that called ACE_INET_Addr::get_host_name() would core dump.
+  	  This was caused by the call to ACE_OS::gethostbyaddr_r().
 
 Tue Jul 24 08:20:02 2001  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 263937e8953..06416479646 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,21 @@
+Tue Jul 24 07:45:03 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Containers_T: Fixed some problems with the lack of 
+	  const for the ACE_DLList and ACE_Double_Linked_List classes.
+  	  Thanks to Michael Kircher for reporting this.
+
+	* ace/config-cygwin32-common.h: Removed the ACE_LACKS_FORK
+	  macro since this is apparently working on Cygwin.  Thanks tj
+ 	  Stefan Kluehspies <Stefan.Kluehspies@gmx.net> for reporting
+ 	  this.
+
+	* ace/config-cygwin32.h: Removed the #define _CLOCKID_T
+	  macro, which should now be handled by the following change.
+
+	* ace/OS.h: Added a #defined for _CLOCKID_T_.  Thanks to
+	  Stefan Kluehspies <Stefan.Kluehspies@gmx.net> for
+	  reporting this.
+
 Tue Jul 24 11:10:59 2001  Krishnakumar B  <kitty@cs.wustl.edu>
 
 	* ace/OS.h:
@@ -16,9 +34,9 @@ Tue Jul 24 10:04:52 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/INET_Addr.cpp:
 
-          Corrected a run-time error on Tru64 with gcc.  Any executable that
-          called ACE_INET_Addr::get_host_name() would core dump.  This was
-          caused by the call to ACE_OS::gethostbyaddr_r().
+          Corrected a run-time error on Tru64 with gcc.  Any executable
+ 	  that called ACE_INET_Addr::get_host_name() would core dump.
+  	  This was caused by the call to ACE_OS::gethostbyaddr_r().
 
 Tue Jul 24 08:20:02 2001  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 263937e8953..06416479646 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,21 @@
+Tue Jul 24 07:45:03 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Containers_T: Fixed some problems with the lack of 
+	  const for the ACE_DLList and ACE_Double_Linked_List classes.
+  	  Thanks to Michael Kircher for reporting this.
+
+	* ace/config-cygwin32-common.h: Removed the ACE_LACKS_FORK
+	  macro since this is apparently working on Cygwin.  Thanks tj
+ 	  Stefan Kluehspies <Stefan.Kluehspies@gmx.net> for reporting
+ 	  this.
+
+	* ace/config-cygwin32.h: Removed the #define _CLOCKID_T
+	  macro, which should now be handled by the following change.
+
+	* ace/OS.h: Added a #defined for _CLOCKID_T_.  Thanks to
+	  Stefan Kluehspies <Stefan.Kluehspies@gmx.net> for
+	  reporting this.
+
 Tue Jul 24 11:10:59 2001  Krishnakumar B  <kitty@cs.wustl.edu>
 
 	* ace/OS.h:
@@ -16,9 +34,9 @@ Tue Jul 24 10:04:52 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/INET_Addr.cpp:
 
-          Corrected a run-time error on Tru64 with gcc.  Any executable that
-          called ACE_INET_Addr::get_host_name() would core dump.  This was
-          caused by the call to ACE_OS::gethostbyaddr_r().
+          Corrected a run-time error on Tru64 with gcc.  Any executable
+ 	  that called ACE_INET_Addr::get_host_name() would core dump.
+  	  This was caused by the call to ACE_OS::gethostbyaddr_r().
 
 Tue Jul 24 08:20:02 2001  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/THANKS b/THANKS
index 53808a58ff6..17fc29bdfe1 100644
--- a/THANKS
+++ b/THANKS
@@ -1295,8 +1295,10 @@ Victor Chernenko <v_chernenko@hotmail.com>
 Frank Wolf <fwolf@gum.de>
 Christophe Galerne <christophgalerne@earthlink.net>
 Steve Harris <harris_s@ociweb.com>
+Stefan Kluehspies <Stefan.Kluehspies@gmx.net>
+Egon Wuchner <Egon.Wuchner@mchp.siemens.de>
 Ugendreshwar Kudupudi <ugenderk@rediffmail.com> 
-          
+
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
 scheme that underlies this distribution and also spent countless hours
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 47a4f91fd3b..83bc7d86200 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -335,7 +335,7 @@ ACE_Unbounded_Stack<T>::remove (const T &item)
 ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator_Base)
 
 template <class T>
-ACE_Double_Linked_List_Iterator_Base<T>::ACE_Double_Linked_List_Iterator_Base (ACE_Double_Linked_List<T> &dll)
+ACE_Double_Linked_List_Iterator_Base<T>::ACE_Double_Linked_List_Iterator_Base (const ACE_Double_Linked_List<T> &dll)
   : current_ (0), dllist_ (&dll)
 {
   // Do nothing
@@ -444,7 +444,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const
 ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator)
 
 template <class T>
-ACE_Double_Linked_List_Iterator<T>::ACE_Double_Linked_List_Iterator (ACE_Double_Linked_List<T> &dll)
+ACE_Double_Linked_List_Iterator<T>::ACE_Double_Linked_List_Iterator (const ACE_Double_Linked_List<T> &dll)
   : ACE_Double_Linked_List_Iterator_Base <T> (dll)
 {
   this->current_ = ACE_static_cast (T*, dll.head_->next_);
@@ -483,7 +483,9 @@ ACE_Double_Linked_List_Iterator<T>::advance_and_remove (int dont_remove)
     {
       item = this->next ();
       this->do_advance ();
-      this->dllist_->remove (item);
+      // It seems dangerous to remove nodes in an iterator, but so it goes...
+      ACE_Double_Linked_List<T> *dllist = ACE_const_cast (ACE_Double_Linked_List<T> *, this->dllist_);
+      dllist->remove (item);
     }
   return item;
 }
@@ -583,7 +585,9 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::advance_and_remove (int dont_remove)
     {
       item = this->next ();
       this->do_retreat ();
-      this->dllist_->remove (item);
+      // It seems dangerous to remove nodes in an iterator, but so it goes...
+      ACE_Double_Linked_List<T> *dllist = ACE_const_cast (ACE_Double_Linked_List<T> *, this->dllist_);
+      dllist->remove (item);
     }
   return item;
 }
@@ -656,7 +660,7 @@ ACE_Double_Linked_List<T>:: ACE_Double_Linked_List (ACE_Allocator *alloc)
 }
 
 template <class T>
-ACE_Double_Linked_List<T>::ACE_Double_Linked_List (ACE_Double_Linked_List<T> &cx)
+ACE_Double_Linked_List<T>::ACE_Double_Linked_List (const ACE_Double_Linked_List<T> &cx)
   : allocator_ (cx.allocator_)
 {
   if (this->allocator_ == 0)
@@ -670,7 +674,7 @@ ACE_Double_Linked_List<T>::ACE_Double_Linked_List (ACE_Double_Linked_List<T> &cx
 }
 
 template <class T> void
-ACE_Double_Linked_List<T>::operator= (ACE_Double_Linked_List<T> &cx)
+ACE_Double_Linked_List<T>::operator= (const ACE_Double_Linked_List<T> &cx)
 {
   if (this != &cx)
     {
@@ -827,7 +831,7 @@ ACE_Double_Linked_List<T>::delete_nodes (void)
 }
 
 template <class T> void
-ACE_Double_Linked_List<T>::copy_nodes (ACE_Double_Linked_List<T> &c)
+ACE_Double_Linked_List<T>::copy_nodes (const ACE_Double_Linked_List<T> &c)
 {
   for (ACE_Double_Linked_List_Iterator<T> iter (c);
        !iter.done ();
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index 444a956dd65..9751c6ca132 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -431,7 +431,7 @@ protected:
   // = Initialization methods.
 
   /// Constructor
-  ACE_Double_Linked_List_Iterator_Base (ACE_Double_Linked_List<T> &);
+  ACE_Double_Linked_List_Iterator_Base (const ACE_Double_Linked_List<T> &);
 
   /// Copy constructor.
   ACE_Double_Linked_List_Iterator_Base (const
@@ -472,7 +472,7 @@ protected:
   /// Remember where we are.
   T *current_;
 
-  ACE_Double_Linked_List<T> *dllist_;
+  const ACE_Double_Linked_List<T> *dllist_;
 };
 
 /**
@@ -493,7 +493,7 @@ class ACE_Double_Linked_List_Iterator : public ACE_Double_Linked_List_Iterator_B
 {
 public:
   // = Initialization method.
-  ACE_Double_Linked_List_Iterator (ACE_Double_Linked_List<T> &);
+  ACE_Double_Linked_List_Iterator (const ACE_Double_Linked_List<T> &);
 
   /**
    * Retasks the iterator to iterate over a new
@@ -650,10 +650,10 @@ public:
   ACE_Double_Linked_List (ACE_Allocator *alloc = 0);
 
   /// Copy constructor.
-  ACE_Double_Linked_List (ACE_Double_Linked_List<T> &);
+  ACE_Double_Linked_List (const ACE_Double_Linked_List<T> &);
 
   /// Assignment operator.
-  void operator= (ACE_Double_Linked_List<T> &);
+  void operator= (const ACE_Double_Linked_List<T> &);
 
   /// Destructor.
   ~ACE_Double_Linked_List (void);
@@ -719,8 +719,8 @@ protected:
   /// Delete all the nodes in the list.
   void delete_nodes (void);
 
-  /// Copy nodes into this list.
-  void copy_nodes (ACE_Double_Linked_List<T> &);
+  /// Copy nodes from <rhs> into this list.
+  void copy_nodes (const ACE_Double_Linked_List<T> &rhs);
 
   /// Setup header pointer.  Called after we create the head node in ctor.
   void init_head (void);
@@ -784,7 +784,6 @@ typedef ACE_Double_Linked_List<ACE_DLList_Node> ACE_DLList_Base;
 template <class T>
 class ACE_DLList : public ACE_DLList_Base
 {
-
   friend class ACE_DLList_Node;
   friend class ACE_Double_Linked_List_Iterator<T>;
   friend class ACE_DLList_Iterator<T>;
@@ -793,7 +792,7 @@ class ACE_DLList : public ACE_DLList_Base
 public:
 
   /// Delegates to ACE_Double_Linked_List.
-  void operator= (ACE_DLList<T> &l);
+  void operator= (const ACE_DLList<T> &l);
 
   // = Classic queue operations.
 
@@ -831,7 +830,7 @@ public:
   ACE_DLList (ACE_Allocator *alloc = 0);
 
   /// Delegates to ACE_Double_Linked_List.
-  ACE_DLList (ACE_DLList<T> &l);
+  ACE_DLList (const ACE_DLList<T> &l);
 
   /// Deletes the list starting from the head.
   ~ACE_DLList (void);
diff --git a/ace/Containers_T.i b/ace/Containers_T.i
index ae123bb4f61..6ec7895fce2 100644
--- a/ace/Containers_T.i
+++ b/ace/Containers_T.i
@@ -316,7 +316,7 @@ ACE_Array<T>::operator!= (const ACE_Array<T> &s) const
 // ****************************************************************
 
 template <class T> ACE_INLINE void
-ACE_DLList<T>::operator= (ACE_DLList<T> &l)
+ACE_DLList<T>::operator= (const ACE_DLList<T> &l)
 {
   *(ACE_DLList_Base *) this = l;
 }
@@ -354,7 +354,7 @@ ACE_DLList<T>::ACE_DLList (ACE_Allocator *alloc )
 }
 
 template <class T> ACE_INLINE
-ACE_DLList<T>::ACE_DLList (ACE_DLList<T> &l)
+ACE_DLList<T>::ACE_DLList (const ACE_DLList<T> &l)
   : ACE_DLList_Base ((ACE_DLList<T> &) l)
 {
 }
diff --git a/ace/OS.h b/ace/OS.h
index b18a38921cc..8fd296c5611 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1064,12 +1064,12 @@ typedef struct timespec
 typedef struct timespec timespec_t;
 # endif /* ACE_LACKS_TIMESPEC_T */
 
-# if !defined (ACE_HAS_CLOCK_GETTIME) && !defined (_CLOCKID_T)
+# if !defined (ACE_HAS_CLOCK_GETTIME) && !(defined (_CLOCKID_T_) || defined (_CLOCKID_T))
 typedef int clockid_t;
 #   if !defined (CLOCK_REALTIME)
 #     define CLOCK_REALTIME 0
 #   endif /* CLOCK_REALTIME */
-# endif /* ! ACE_HAS_CLOCK_GETTIME && ! _CLOCKID_T */
+# endif /* ! ACE_HAS_CLOCK_GETTIME && ! _CLOCKID_T_ */
 
 // -------------------------------------------------------------------
 // These forward declarations are only used to circumvent a bug in
diff --git a/ace/config-cygwin32-common.h b/ace/config-cygwin32-common.h
index 64b02d233fd..176fb6d9170 100644
--- a/ace/config-cygwin32-common.h
+++ b/ace/config-cygwin32-common.h
@@ -25,7 +25,6 @@
 #define ACE_LACKS_TELLDIR
 #define ACE_LACKS_SYSV_SHMEM
 
-#define ACE_LACKS_FORK
 #define ACE_LACKS_MMAP
 #define ACE_LACKS_MPROTECT
 
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index aef0889e9f2..ec433dc1e17 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -11,7 +11,6 @@
 #include "ace/config-cygwin32-common.h"
 
 #define ACE_HAS_AUTOMATIC_INIT_FINI
-#define _CLOCKID_T
 
 #include "ace/post.h"
 #endif /* ACE_CONFIG_H */