ChangeLogTag:Sat Dec 1 18:03:51 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

17 files changed, 222 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 38d3cc26c16..e644a2f590f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+Sat Dec  1 18:03:51 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-macosx.h:
+  	* include/makeinclude/platform_macosx.GNU:
+	  Added support so that ACE will build and run on Mac OS X 10.1.
+  	  Thanks to John Michael Zorko <j.zorko@att.net> for contributing
+ 	  this.
+	
+Fri Nov 30 19:08:19 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/ARGV.cpp (dump): Fixed a bug with dump() so that it
+	  works properly even if argv_ changes.  Thanks to Kyle Brost
+ 	  <Kyle.Brost@quest.com> for this fix.
+
+Thu Nov 29 16:31:57 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.{h,i,cpp}: Changed the return value of
+	  ACE_Time_Value::operator+= and operator -= to be ACE_Time_Value
+ 	  & rather than void.  Also, added overloaded operator++ and
+ 	  operator--.  This is all to make this stuff work better with
+ 	  ACE_Atomic_Op.  Thanks to Kelly F. Hickel <kfh@mqsoftware.com>
+ 	  for suggesting this.
+
+	* ace/Asynch_Acceptor.cpp (parse_address): Changed
+   	  the "message_block.size () - 2 * this->address_size ()" argument
+ 	  to "bytes_to_read_" to work properly on Win32.  Thanks to Kelly
+ 	  F. Hickel <kfh@mqsoftware.com> for reporting this.
+
+Wed Nov 28 17:44:26 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS_Dirent.cpp (readdir_emulation): Fixed a memory leak
+	  in the dirent emulation.  Thanks to Olivier Brunet
+ 	  <obrunet@groupama-ccama.tm.fr> for reporting this.
+
+	* ace/SPIPE_Acceptor.h (ACE_SPIPE_Acceptor): Clarified the
+	  return value of open().  Thanks to Garth Watney
+ 	  <Garth.J.Watney@jpl.nasa.gov> for motivating this.
+
+	* ace/OS.h: Added a workaround to the Borland bug for
+	  ACE_OS::stat().  Thanks to Christopher Kohlhoff
+ 	  <chris@kohlhoff.com> and Chris Able <cable@scires.com> for
+ 	  reporting/fixing this.
+  
 Sat Dec 01 09:26:27 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.2.1 released.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 38d3cc26c16..e644a2f590f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,46 @@
+Sat Dec  1 18:03:51 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-macosx.h:
+  	* include/makeinclude/platform_macosx.GNU:
+	  Added support so that ACE will build and run on Mac OS X 10.1.
+  	  Thanks to John Michael Zorko <j.zorko@att.net> for contributing
+ 	  this.
+	
+Fri Nov 30 19:08:19 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/ARGV.cpp (dump): Fixed a bug with dump() so that it
+	  works properly even if argv_ changes.  Thanks to Kyle Brost
+ 	  <Kyle.Brost@quest.com> for this fix.
+
+Thu Nov 29 16:31:57 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.{h,i,cpp}: Changed the return value of
+	  ACE_Time_Value::operator+= and operator -= to be ACE_Time_Value
+ 	  & rather than void.  Also, added overloaded operator++ and
+ 	  operator--.  This is all to make this stuff work better with
+ 	  ACE_Atomic_Op.  Thanks to Kelly F. Hickel <kfh@mqsoftware.com>
+ 	  for suggesting this.
+
+	* ace/Asynch_Acceptor.cpp (parse_address): Changed
+   	  the "message_block.size () - 2 * this->address_size ()" argument
+ 	  to "bytes_to_read_" to work properly on Win32.  Thanks to Kelly
+ 	  F. Hickel <kfh@mqsoftware.com> for reporting this.
+
+Wed Nov 28 17:44:26 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS_Dirent.cpp (readdir_emulation): Fixed a memory leak
+	  in the dirent emulation.  Thanks to Olivier Brunet
+ 	  <obrunet@groupama-ccama.tm.fr> for reporting this.
+
+	* ace/SPIPE_Acceptor.h (ACE_SPIPE_Acceptor): Clarified the
+	  return value of open().  Thanks to Garth Watney
+ 	  <Garth.J.Watney@jpl.nasa.gov> for motivating this.
+
+	* ace/OS.h: Added a workaround to the Borland bug for
+	  ACE_OS::stat().  Thanks to Christopher Kohlhoff
+ 	  <chris@kohlhoff.com> and Chris Able <cable@scires.com> for
+ 	  reporting/fixing this.
+  
 Sat Dec 01 09:26:27 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.2.1 released.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 38d3cc26c16..e644a2f590f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,46 @@
+Sat Dec  1 18:03:51 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-macosx.h:
+  	* include/makeinclude/platform_macosx.GNU:
+	  Added support so that ACE will build and run on Mac OS X 10.1.
+  	  Thanks to John Michael Zorko <j.zorko@att.net> for contributing
+ 	  this.
+	
+Fri Nov 30 19:08:19 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/ARGV.cpp (dump): Fixed a bug with dump() so that it
+	  works properly even if argv_ changes.  Thanks to Kyle Brost
+ 	  <Kyle.Brost@quest.com> for this fix.
+
+Thu Nov 29 16:31:57 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.{h,i,cpp}: Changed the return value of
+	  ACE_Time_Value::operator+= and operator -= to be ACE_Time_Value
+ 	  & rather than void.  Also, added overloaded operator++ and
+ 	  operator--.  This is all to make this stuff work better with
+ 	  ACE_Atomic_Op.  Thanks to Kelly F. Hickel <kfh@mqsoftware.com>
+ 	  for suggesting this.
+
+	* ace/Asynch_Acceptor.cpp (parse_address): Changed
+   	  the "message_block.size () - 2 * this->address_size ()" argument
+ 	  to "bytes_to_read_" to work properly on Win32.  Thanks to Kelly
+ 	  F. Hickel <kfh@mqsoftware.com> for reporting this.
+
+Wed Nov 28 17:44:26 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS_Dirent.cpp (readdir_emulation): Fixed a memory leak
+	  in the dirent emulation.  Thanks to Olivier Brunet
+ 	  <obrunet@groupama-ccama.tm.fr> for reporting this.
+
+	* ace/SPIPE_Acceptor.h (ACE_SPIPE_Acceptor): Clarified the
+	  return value of open().  Thanks to Garth Watney
+ 	  <Garth.J.Watney@jpl.nasa.gov> for motivating this.
+
+	* ace/OS.h: Added a workaround to the Borland bug for
+	  ACE_OS::stat().  Thanks to Christopher Kohlhoff
+ 	  <chris@kohlhoff.com> and Chris Able <cable@scires.com> for
+ 	  reporting/fixing this.
+  
 Sat Dec 01 09:26:27 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.2.1 released.
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 81690801a92..fddce3eecad 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,7 +1,13 @@
-Sat Dec 01 09:37:26 2001  Balachandran  <bala@cs.wustl.edu>
+Wed Nov 28 18:33:35 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-        * TAO version 1.2.1 released.
+	* docs/Options.html: Clarified that it's legal to pass
+	  multiple -ORBSvcConfDirective options to the ORB's command-line.
+	  Thanks to Patrick N <pn@milhouse.co.uk> for motivating this.
 
+Sat Dec 01 09:37:26 2001  Balachandran  <bala@cs.wustl.edu>
+  
+        * TAO version 1.2.1 released.
+  
 Wed Nov 28 13:40:39 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
         * tao/SmartProxies/SmartProxies.dsp:
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 010ac9f4cf5..45f2307d3b6 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -152,7 +152,8 @@ merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
   <!-- <TR NAME="ORBsvcconf"> -->
   <tr>
     <TD><CODE>-ORBSvcConfDirective</CODE> <EM>directivestring</EM></TD>
-    <TD>Specifies a service configuration directive, which is passed to ACE's Service Configurator.</TD>
+    <TD>Specifies a service configuration directive, which is passed to ACE's Service Configurator.
+    You can pass multiple of these options on the same command-line. </TD>
   </TR>
   <tr>
     <TD><CODE><A
diff --git a/THANKS b/THANKS
index 55cedd9afdf..6c7a472a47d 100644
--- a/THANKS
+++ b/THANKS
@@ -1373,6 +1373,8 @@ C Chan <CChan@md.aacisd.com>
 Alexey Chalimov <alexey@allcharge.com>
 Andrea Bernicchia <a.bernicchia@acsys.it>
 Praphul Menon <praphulm@yahoo.com>
+Patrick N <pn@milhouse.co.uk> 
+Garth Watney <Garth.J.Watney@jpl.nasa.gov>
 
 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/ARGV.cpp b/ace/ARGV.cpp
index 2d653a0ca58..8fb4668518d 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -22,8 +22,13 @@ ACE_ARGV::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("argc_ = %d"), this->argc_));
 
+  ACE_ARGV *this_obj = ACE_const_cast (ACE_ARGV *, this);
+
   for (size_t i = 0; i < this->argc_; i++)
-    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nargv_[%i] = %s"), i, this->argv_[i]));
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("\nargv_[%i] = %s"),
+                i,
+                this_obj->argv ()[i]));
 
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 08f625e86c7..32155af11d8 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -382,7 +382,7 @@ ACE_Asynch_Acceptor<HANDLER>::parse_address (const
   int remote_size = 0;
 
   ::GetAcceptExSockaddrs (message_block.rd_ptr (),
-                          message_block.size () - 2 * this->address_size (),
+                          bytes_to_read_,
                           this->address_size (),
                           this->address_size (),
                           &local_addr,
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 7c0c326eb5d..a97e166e486 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -9,7 +9,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_MEMORY_POOL_H
 #define ACE_MEMORY_POOL_H
 #include "ace/pre.h"
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 930c2811b15..fcb5214d3d3 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -260,6 +260,48 @@ const DWORDLONG ACE_Time_Value::FILETIME_to_timval_skew =
 ACE_INT64_LITERAL (0x19db1ded53e8000);
 # endif
 
+// Increment microseconds (the only reason this is here is to allow
+// the use of ACE_Atomic_Op with ACE_Time_Value).
+
+ACE_Time_Value
+ACE_Time_Value::operator +(int)
+{
+  ACE_OS_TRACE ("ACE_Time_Value::operator++(int)");
+  usec (usec () 1);
+  normalize ();
+  return *this;
+}
+
+ACE_Time_Value
+&ACE_Time_Value::operator +(void)
+{
+  ACE_OS_TRACE ("ACE_Time_Value::operator++(void)");
+  usec (usec () 1);
+  normalize ();
+  return *this;
+}
+
+// Decrement microseconds (the only reason this is here is / to allow
+// the use of ACE_Atomic_Op with ACE_Time_Value).
+
+ACE_Time_Value 
+ACE_Time_Value::operator -- (int)
+{
+  ACE_OS_TRACE ("ACE_Time_Value::operator--(int)");
+  usec (usec () - 1);
+  normalize ();
+  return *this;
+}
+
+ACE_Time_Value &
+ACE_Time_Value::operator -- (void)
+{
+  ACE_OS_TRACE ("ACE_Time_Value::operator--(void)");
+  usec (usec () - 1);
+  normalize ();
+  return *this;
+}
+
 //  Initializes the ACE_Time_Value object from a Win32 FILETIME
 
 ACE_Time_Value::ACE_Time_Value (const FILETIME &file_time)
diff --git a/ace/OS.h b/ace/OS.h
index 6c93b298473..82bb6d9fcb8 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1200,14 +1200,24 @@ public:
   // = The following arithmetic methods operate on <Time_Value>s.
 
   /// Add <tv> to this.
-  void operator += (const ACE_Time_Value &tv);
+  ACE_Time_Value &operator += (const ACE_Time_Value &tv);
 
   /// Subtract <tv> to this.
-  void operator -= (const ACE_Time_Value &tv);
+  ACE_Time_Value &operator -= (const ACE_Time_Value &tv);
 
   /// Multiply the time value by the <d> factor, which must be >= 0.
   ACE_Time_Value &operator *= (double d);
 
+  /// Increment microseconds (the only reason this is here is
+  /// to allow the use of ACE_Atomic_Op with ACE_Time_Value).
+  ACE_Time_Value operator++ (int);  // Postfix advance
+  ACE_Time_Value &operator++ (void);  // Prefix advance
+ 
+  /// Decrement microseconds (the only reason this is here is
+  /// to allow the use of ACE_Atomic_Op with ACE_Time_Value).
+  ACE_Time_Value operator-- (int);  // Postfix dec
+  ACE_Time_Value &operator-- (void);  // Prefix dec
+
   /// Adds two ACE_Time_Value objects together, returns the sum.
   friend ACE_OS_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1,
                                                const ACE_Time_Value &tv2);
@@ -4964,7 +4974,7 @@ typedef double ACE_timer_t;
   // = typedef for the _stat data structure
   typedef pace_stat_s ACE_stat;
 # else
-#   if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#   if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__)
       typedef struct _stat ACE_stat;
 #   else
       typedef struct stat ACE_stat;
diff --git a/ace/OS.i b/ace/OS.i
index 4c375bb5c6a..503d44fcc71 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -423,24 +423,26 @@ operator != (const ACE_Time_Value &tv1,
 
 // Add TV to this.
 
-ACE_INLINE void
+ACE_INLINE ACE_Time_Value &
 ACE_Time_Value::operator+= (const ACE_Time_Value &tv)
 {
   ACE_OS_TRACE ("ACE_Time_Value::operator+=");
   this->sec (this->sec () + tv.sec ());
   this->usec (this->usec () + tv.usec ());
   this->normalize ();
+  return *this;
 }
 
 // Subtract TV to this.
 
-ACE_INLINE void
+ACE_INLINE ACE_Time_Value &
 ACE_Time_Value::operator-= (const ACE_Time_Value &tv)
 {
   ACE_OS_TRACE ("ACE_Time_Value::operator-=");
   this->sec (this->sec () - tv.sec ());
   this->usec (this->usec () - tv.usec ());
   this->normalize ();
+  return *this;
 }
 
 // Adds two ACE_Time_Value objects together, returns the sum.
diff --git a/ace/OS_Dirent.cpp b/ace/OS_Dirent.cpp
index 7f6954a44fc..8b1d82d6bab 100644
--- a/ace/OS_Dirent.cpp
+++ b/ace/OS_Dirent.cpp
@@ -57,6 +57,7 @@ ACE_OS_Dirent::opendir_emulation (const ACE_TCHAR *filename)
     ACE_OS_String::strcat (dir->directory_name_, extra);
   dir->current_handle_ = INVALID_HANDLE_VALUE;
   dir->started_reading_ = 0;
+  dir->dirent_ = 0;
   return dir;
 #else /* ACE_WIN32 */
   ACE_UNUSED_ARG (filename);
@@ -73,6 +74,7 @@ ACE_OS_Dirent::closedir_emulation (ACE_DIR *d)
 
   d->current_handle_ = INVALID_HANDLE_VALUE;
   d->started_reading_ = 0;
+  ACE_OS_Memory::free (d->dirent_);
 #else /* ACE_WIN32 */
   ACE_UNUSED_ARG (d);  
 #endif /* ACE_WIN32 */
@@ -82,6 +84,9 @@ dirent *
 ACE_OS_Dirent::readdir_emulation (ACE_DIR *d)
 {
 #if defined (ACE_WIN32)
+  ACE_OS_Memory::free (d->dirent_);
+  d->dirent_ = 0;
+
   if (!d->started_reading_)
     {
       d->current_handle_ = ACE_TEXT_FindFirstFile (d->directory_name_,
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index c000f039004..9e3a1bf0db3 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -109,9 +109,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
 
 
   if (handle == ACE_INVALID_HANDLE)
-    {
-      return -1;
-    }
+    return -1;
   else
     {
       // Start the Connect (analogous to listen () for a socket).  Completion
diff --git a/ace/SPIPE_Acceptor.h b/ace/SPIPE_Acceptor.h
index c9e856a12a3..5035d5a6284 100644
--- a/ace/SPIPE_Acceptor.h
+++ b/ace/SPIPE_Acceptor.h
@@ -43,7 +43,8 @@ public:
                       int reuse_addr = 1,
                       int perms = ACE_DEFAULT_FILE_PERMS);
 
-  /// Initiate a passive-mode STREAM pipe listener.
+  /// Initiate a passive-mode STREAM pipe listener.  Returns 0 on
+  /// success and -1 on failure.
   int open (const ACE_SPIPE_Addr &local_sap,
             int reuse_addr = 1,
             int perms = ACE_DEFAULT_FILE_PERMS);
diff --git a/ace/config-macosx.h b/ace/config-macosx.h
index 71b5d09a49b..19852858757 100644
--- a/ace/config-macosx.h
+++ b/ace/config-macosx.h
@@ -16,6 +16,8 @@
 
 #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 
+#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
+
 #if defined (ACE_HAS_PENTIUM)
 # undef ACE_HAS_PENTIUM
 #endif /* ACE_HAS_PENTIUM */
diff --git a/include/makeinclude/platform_macosx.GNU b/include/makeinclude/platform_macosx.GNU
index c9b9037a175..ade7f66978b 100644
--- a/include/makeinclude/platform_macosx.GNU
+++ b/include/makeinclude/platform_macosx.GNU
@@ -1,17 +1,16 @@
 # platform_macosx.GNU,v 4.6 2001/08/14 18:57:28 bala Exp
 # platform_macosx.GNU
-# preliminary support for Mac OS X DP4, some stuff still doesn't work.
+# support for Mac OS X 10.1
 
 CC              = cc
-CXX             = c++  
-CFLAGS          += -Wall -Wpointer-arith -pipe 
-CCFLAGS         += $(CFLAGS) -fimplicit-templates -fcheck-new 
+CXX             = c++
+CFLAGS          += -Wall -Wpointer-arith -pipe
+CCFLAGS         += $(CFLAGS) -fimplicit-templates 
 DCFLAGS         += -g
 DLD             = libtool
 LD              = $(CXX)
 LDFLAGS		+= -flat_namespace
-LDONLYFLAGS     += -flat-namespace
-LIBS            += -lcc_dynamic -lstdc++ -lpcap
+LIBS            += -lcc_dynamic -lstdc++ -lSystem $(ACELIB)
 OCFLAGS         += -O3
 RANLIB          = ranlib
 SOEXT		= dylib