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

8 files changed, 25 insertions, 10 deletions

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