ChangeLogTag:Sun Feb 23 12:16:34 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

12 files changed, 71 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 999f078490d..e1c0f5908d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sun Feb 23 12:16:34 2003  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/WIN32_Asynch_IO.cpp (cancel): Added support for cancel() on
+	  MinGW.  Thanks to Vince for this fix.
+
+	* examples/Mem_Map/Makefile: Moved the definition of DIRS to
+	  later in the Makefile so we can exclude it from the MinGW
+	  build.  Thanks to Vince for reporting this, as well.
+
+	* ace/WIN32_Proactor.cpp (close): Make sure to check whether
+	  GetQueuedQueuedCompletion() returns false.  Thanks to Vince
+ 	  Mounts <vince@mounts.cc> for reporting this.
+
 Sat Feb 22 08:16:36 2003  Ossama Othman  <ossama@uci.edu>
 
 	* ace/Basic_Types.h (operator++, operator--):
@@ -405,3 +418,14 @@ Thu Feb 20 09:23:51 2003  Ossama Othman  <ossama@uci.edu>
 	  Removed friend declarations for the
 	  ACE_SSL_SOCK_{Acceptor,Connector} classes.  They are
 	  unnecessary.
+
+Tue Feb 11 17:14:56 2003  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/TTY_IO.cpp: Fixed several problems with DTR enabling.  Thanks to 
+	  Ray Limpus <ray.limpus@boeing.com> for reporting this.
+
+Thu Feb  6 16:36:18 2003  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Bound_Ptr.{h,i}: Made the get() method const.  Thanks to
+	  Chris Kohlhoff for reporting this.
+  
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index b45bfaa2c7e..fa1f7132bf5 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -126,10 +126,10 @@ incoming operation with the correct operation at the servant.  TAO's
 IDL compiler supports perfect hashing, binary search, and dynamic
 hashing demuxing strategies.  By default, TAO's IDL compiler tries to
 generate perfect hash functions, which is generally the most <A
-HREF="http://www.cs.wustl.edu/~schmidt/COOTS-99.ps.gz">efficient and
+HREF="http://www.cs.wustl.edu/~schmidt/PDF/COOTS-99.pdf">efficient and
 predictable operation demuxing technique</A>.  To generate perfect
 hash functions, TAO's IDL compiler uses <a
-href="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">gperf </a>, which
+href="http://www.cs.wustl.edu/~schmidt/PDF/gperf.pdf">gperf </a>, which
 is a general-purpose perfect hash function generator. <P>
 
 To configure TAO's IDL compiler to support perfect hashing please do
@@ -174,7 +174,7 @@ generate the right collocated stubs (or not generating any at all using
 both  '<a href="#Sp"><code>-Sp</code></a>' and '<a
 href="#Sd"><code>-Sd</code></a>' flags at the same time if
 it's a pure client.)  See our <a
-href="http://www.cs.wustl.edu/~schmidt/C++-report-col18.ps.gz">collocation
+href="http://www.cs.wustl.edu/~schmidt/PDF/C++-report-col18.pdf">collocation
 paper</a> for a detail discussion on the collocation support in
 TAO.<p>
 
@@ -388,7 +388,7 @@ also receives other options that are specific to it. <P>
 
     <td>To specify the IDL compiler to generate skelton code that uses perfect
         hashed operation demuxing strategy, which is the default strategy. Perfect
-        hashing uses <a href="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">gperf
+        hashing uses <a href="http://www.cs.wustl.edu/~schmidt/PDF/gperf.pdf">gperf
         </a>program,
         to generate demuxing methods.&nbsp;</td>
     <td>&nbsp;</td>
diff --git a/THANKS b/THANKS
index c1bc97288d4..5f5015a85d5 100644
--- a/THANKS
+++ b/THANKS
@@ -325,7 +325,7 @@ Erik Margraf <erik@asgard.gud.siemens.co.at>
 Bryan Doerr <Bryan.S.Doerr@boeing.com>
 Adam Miller <adam@royalblueny.com>
 Thomas Jordan <ace@programmer.net>
-Keith Nicewarner <knicewar@erg.sri.com>
+Keith Nicewarner <knicewar@email.arc.nasa.gov>
 Frederic Andres <andres@rd.nacsis.ac.jp>
 Achint Sandhu <sandhu@nortelnetworks.com>
 Mitch Kuninsky <Mitch_Kuninsky@avid.com>
@@ -482,7 +482,7 @@ Olivier Lau <olivier_lau@srtelecom.com>
 Achim Stindt <stindt@conbis.de>
 Fredrik Lindahl <fredrik.lindahl@ausys.se>
 Joseph Weihs <joseph-w@Orbotech.Co.IL>
-Serge Kolgan <skolgan@dctd.saic.com>
+Serge Kolgan <skolgan@objectsciences.com>
 James Megquier <jmegq@bbn.com>
 Martin Krumpolec <krumpolec@asset.sk>
 Michael Thomas <Michael.Thomas@Australia.Boeing.com>
@@ -1664,9 +1664,14 @@ Mario Hofmann <Mario.Hofmann@SystemaGmbH.de>
 Bruce MacDonald <brucemac@netcomuk.co.uk>
 Jeffrey Graham <jgraham@titan.com>
 Otis Nyandoro <o.nyandoro@ee.wits.ac.za>
+Ray Limpus <ray.limpus@boeing.com>
 Dmitri Belogaj <belogaj@nentec.de>
 Will Christof <Will.Christof@krones.de>
-Ferran Boladeres Salvadó <bds@iis.fhg.de>
+Ferran Boladeres Salvad <bds@iis.fhg.de>
+Juan Carlos Montes Costa <jcmontes@saincotrafico.com>
+Edward Scott  <eas@prismtechnologies.com>
+Steve Spencer <sdssoftware@btopenworld.com>
+Fukasawa Mitsuo <fukasawa_mitsuo@nifty.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
diff --git a/ace/Bound_Ptr.h b/ace/Bound_Ptr.h
index 3e2e4731bdf..a5b381c69e7 100644
--- a/ace/Bound_Ptr.h
+++ b/ace/Bound_Ptr.h
@@ -169,7 +169,7 @@ public:
   X &operator * (void) const;
 
   /// Get the pointer value.
-  X *get (void);
+  X *get (void) const;
 
   /// Resets the ACE_Strong_Bound_Ptr to refer to a different
   /// underlying object.
diff --git a/ace/Bound_Ptr.i b/ace/Bound_Ptr.i
index 964c7975dd9..92229126592 100644
--- a/ace/Bound_Ptr.i
+++ b/ace/Bound_Ptr.i
@@ -272,7 +272,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator *() const
 }
 
 template <class X, class ACE_LOCK> inline X*
-ACE_Strong_Bound_Ptr<X, ACE_LOCK>::get (void)
+ACE_Strong_Bound_Ptr<X, ACE_LOCK>::get (void) const
 {
   return this->ptr_;
 }
diff --git a/ace/Module.cpp b/ace/Module.cpp
index 2272dc2eed9..dec2486f12a 100644
--- a/ace/Module.cpp
+++ b/ace/Module.cpp
@@ -28,7 +28,7 @@ ACE_Module<ACE_SYNCH_USE>::dump (void) const
 
 template <ACE_SYNCH_DECL> void
 ACE_Module<ACE_SYNCH_USE>::writer (ACE_Task<ACE_SYNCH_USE> *q,
-                                 int flags /* = M_DELETE_WRITER */)
+                                   int flags /* = M_DELETE_WRITER */)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::writer");
 
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index a48803faa8f..fb9ba6e09b3 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -230,7 +230,7 @@ ACE_Stream<ACE_SYNCH_USE>::pop (int flags)
 
 template <ACE_SYNCH_DECL> int
 ACE_Stream<ACE_SYNCH_USE>::remove (const ACE_TCHAR *name,
-                                 int flags)
+                                   int flags)
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::remove");
   ACE_Module<ACE_SYNCH_USE> *prev = 0;
@@ -278,8 +278,8 @@ ACE_Stream<ACE_SYNCH_USE>::find (const ACE_TCHAR *name)
 
 template <ACE_SYNCH_DECL> int
 ACE_Stream<ACE_SYNCH_USE>::push_module (ACE_Module<ACE_SYNCH_USE> *new_top,
-                                      ACE_Module<ACE_SYNCH_USE> *current_top,
-                                      ACE_Module<ACE_SYNCH_USE> *head)
+                                        ACE_Module<ACE_SYNCH_USE> *current_top,
+                                        ACE_Module<ACE_SYNCH_USE> *head)
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::push_module");
   ACE_Task<ACE_SYNCH_USE> *nt_reader = new_top->reader ();
diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp
index e215ca62c34..b325ef99e11 100644
--- a/ace/TTY_IO.cpp
+++ b/ace/TTY_IO.cpp
@@ -275,7 +275,12 @@ ACE_TTY_IO::control (Control_Mode cmd,
       // ensure DTR is enabled
       int status;
       this->ACE_IO_SAP::control(TIOCMGET, &status);
-      status |= TIOCM_DTR;
+
+       if (arg->dtrdisable) 
+         status &= ~TIOCM_DTR;
+       else 
+         status |= TIOCM_DTR;
+
       this->ACE_IO_SAP::control(TIOCMSET,&status);
 #endif /* definded (TIOCMGET) */
 
@@ -418,7 +423,11 @@ ACE_TTY_IO::control (Control_Mode cmd,
       if (arg->xofflim != -1)
         dcb.XoffLim  = arg->xofflim;
 
-      dcb.fDtrControl = DTR_CONTROL_ENABLE;
+     if (arg->dtrdisable) 
+       dcb.fDtrControl = DTR_CONTROL_DISABLE;
+     else
+       dcb.fDtrControl = DTR_CONTROL_ENABLE;
+
       dcb.fAbortOnError = FALSE;
       dcb.fErrorChar = FALSE; 
       dcb.fNull = FALSE; 
diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp
index 0300f1d6f76..4c02cf88324 100644
--- a/ace/WIN32_Asynch_IO.cpp
+++ b/ace/WIN32_Asynch_IO.cpp
@@ -157,7 +157,8 @@ ACE_WIN32_Asynch_Operation::cancel (void)
 {
 #if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \
     && (   (defined (_MSC_VER) && (_MSC_VER > 1020)) \
-        || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)))
+        || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)) \
+        || (defined (__MINGW32)))
   // All I/O operations that are canceled will complete with the error
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
   // operations will occur normally.
diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp
index 9850bccc658..dfbbe4fd025 100644
--- a/ace/WIN32_Proactor.cpp
+++ b/ace/WIN32_Proactor.cpp
@@ -97,7 +97,7 @@ ACE_WIN32_Proactor::close (void)
              &overlapped,
              0);  // poll
 
-          if (overlapped == 0)
+          if (overlapped == 0 || res == FALSE)
             break;
 
           ACE_WIN32_Asynch_Result *asynch_result =
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index fc732de8245..db4c7b0652d 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -22,6 +22,11 @@
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+/*clearerr is not defined when _REENTRANT is not defined*/
+#if ACE_MT_SAFE == 0
+#define ACE_LACKS_CLEARERR
+#endif /* ACE_MT_SAFE == 0 */
+
 // Compile using multi-thread libraries.
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
diff --git a/examples/Mem_Map/Makefile b/examples/Mem_Map/Makefile
index 4a1ef282611..d108b7cf4b3 100644
--- a/examples/Mem_Map/Makefile
+++ b/examples/Mem_Map/Makefile
@@ -8,14 +8,22 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-DIRS  =	IO-tests \
-        file-reverse
+# move definition of DIRS below so we can exclude one of them from
+# mingw build
 
 #----------------------------------------------------------------------------
 #	macros and targets
 #----------------------------------------------------------------------------
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+ifneq  ($(mingw32), 1)
+ DIRS  = IO-tests \
+        file-reverse
+else
+ DIRS  = file-reverse
+endif
+
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU