ChangeLogTag:Thu May 24 12:15:35 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

8 files changed, 82 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 3657ce73443..f5fb8e81c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu May 24 12:15:35 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.h: Added #defines for RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL.
+	  Thanks to Kobi Cohen-Arazi <kobic@bvr.co.il> for suggesting
+ 	  this.
+  
+	* ace/OS.h: Updated the ACE_Time_Value class to point out that the values 
+	  are in secs and usecs.  Thanks to Israel Illescas Gomez
+ 	  <illescas@dycsa.es> for motivating this.
+
 Thu May 24 18:08:27 2001  Steve Huston  <shuston@riverace.com>
 
         * tests/run_test.lst: Re-enable MT_Reactor_Timer_Test.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 3657ce73443..f5fb8e81c65 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Thu May 24 12:15:35 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.h: Added #defines for RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL.
+	  Thanks to Kobi Cohen-Arazi <kobic@bvr.co.il> for suggesting
+ 	  this.
+  
+	* ace/OS.h: Updated the ACE_Time_Value class to point out that the values 
+	  are in secs and usecs.  Thanks to Israel Illescas Gomez
+ 	  <illescas@dycsa.es> for motivating this.
+
 Thu May 24 18:08:27 2001  Steve Huston  <shuston@riverace.com>
 
         * tests/run_test.lst: Re-enable MT_Reactor_Timer_Test.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3657ce73443..f5fb8e81c65 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Thu May 24 12:15:35 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.h: Added #defines for RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL.
+	  Thanks to Kobi Cohen-Arazi <kobic@bvr.co.il> for suggesting
+ 	  this.
+  
+	* ace/OS.h: Updated the ACE_Time_Value class to point out that the values 
+	  are in secs and usecs.  Thanks to Israel Illescas Gomez
+ 	  <illescas@dycsa.es> for motivating this.
+
 Thu May 24 18:08:27 2001  Steve Huston  <shuston@riverace.com>
 
         * tests/run_test.lst: Re-enable MT_Reactor_Timer_Test.
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
index 47c768ffbaa..789e994a02a 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -17,26 +17,31 @@ HREF="http://www.omg.org/library/c2indx.html">CORBA</a> Documentation</h3>
 <table cellpadding="10" cellspacing="8" border="10">
   <tr>
     <td><font SIZE="+1"><dl>
-      <dt>TAO <a HREF="http://www.cs.wustl.edu/~schmidt/corba-research-realtime.html">Technical
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> TAO <a HREF="http://www.cs.wustl.edu/~schmidt/corba-research-realtime.html">Technical
         Papers</a> </dt><P>
-      <dt>TAO <a HREF="http://www.cs.wustl.edu/~schmidt/TAO/index.html">Tutorials</a></dt><P>
-      <dt>TAO <a HREF="releasenotes/index.html">Release Notes</a> </dt><P>
-      <dt><A HREF="http://www.theaceorb.com">OCI</A> TAO <a HREF="http://www.theaceorb.com/faq/">FAQ</a> </dt><P>
-      <dt><a HREF="components.html">ORB Configuration Options</a> </dt><P>
-      <dt>TAO <a HREF="compiler.html">IDL Compiler Options</a> </dt><P>
-      <dt><a HREF="orbsvcs.html">ORB Services Directories</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> TAO <a HREF="http://www.cs.wustl.edu/~schmidt/TAO/index.html">Tutorials</a></dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> TAO <a HREF="releasenotes/index.html">Release Notes</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <A HREF="http://www.theaceorb.com">OCI</A> TAO <a HREF="http://www.theaceorb.com/faq/">FAQ</a> </dt><P>
+      <DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <A
+     HREF="http://doc.ece.uci.edu/Doxygen/">Doxygen Documentation</A> <P>
     </dl>
     </td>
 
     <td><font SIZE="+1"><dl>
-      <dt>TAO <a href="rtcorba/index.html">Real-Time CORBA</a> </dt>
-      <dt>&nbsp; </dt>
-      <dt><a HREF="INS.html">Interoperable Naming Service</a> </dt><P>
-      <dt><a HREF="implrepo/index.html">Implementation Repository</a> </dt><P>
-      <dt>ACE+TAO <a HREF="minimumTAO.html">Subsetting</a></dt><p>
-      <dt>TAO <a href="exceptions.html">Exception Handling</a></dt><p>
-      <dt><a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
-      <dt><a HREF="pluggable_protocols/index.html">Writing Pluggable Protocols</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="components.html">ORB Configuration Options</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> TAO <a HREF="compiler.html">IDL Compiler Options</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="orbsvcs.html">ORB Services Directories</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="INS.html">Interoperable Naming Service</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="implrepo/index.html">Implementation Repository</a> </dt><P>
+    </dl>
+    </td>
+
+    <td><font SIZE="+1"><dl>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> TAO <a href="rtcorba/index.html">Real-Time CORBA</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> ACE+TAO <a HREF="minimumTAO.html">Subsetting</a></dt><p>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> TAO <a href="exceptions.html">Exception Handling</a></dt><p>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="pluggable_protocols/index.html">Writing Pluggable Protocols</a> </dt><P>
     </dl>
       </font>
     </td>
diff --git a/THANKS b/THANKS
index bef4f348219..c92eef0a2b5 100644
--- a/THANKS
+++ b/THANKS
@@ -1244,6 +1244,9 @@ Wayne Erchak <wayne@stentor.com>
 Yew Khong See <seeyk@yahoo.com>
 Greg Thompson <gregt@ot.com.au>
 Mike Pyle <mike.pyle@burning-glass.com>
+Kobi Cohen-Arazi <kobic@bvr.co.il>
+Israel Illescas Gomez <illescas@dycsa.es>
+Brodie Thiesfield <brodie.thiesfield@activesky.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/Configuration_Import_Export.h b/ace/Configuration_Import_Export.h
index ae6a138c303..c5b94997816 100644
--- a/ace/Configuration_Import_Export.h
+++ b/ace/Configuration_Import_Export.h
@@ -168,7 +168,7 @@ public:
   /**
    * Construction
    */
-  ACE_Ini_ImpExp(ACE_Configuration&);
+  ACE_Ini_ImpExp (ACE_Configuration&);
     
   /**
    * Destructor
@@ -181,7 +181,7 @@ public:
    * Since the open method relies on this method, this method
    * acts as open if an open has not already occurred.
    */
-  virtual int import_config(const ACE_TCHAR* filename);
+  virtual int import_config (const ACE_TCHAR* filename);
 
   /**
    * This method exports the entire configuration database to <filename>.
diff --git a/ace/OS.h b/ace/OS.h
index e28e5e6515d..129b6886fb9 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1089,7 +1089,7 @@ ACE_OS_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1,
 /**
  * @class ACE_Time_Value
  *
- * @brief Operations on "timeval" structures.
+ * @brief Operations on "timeval" structures, which express time in <secs> and <usecs>.
  *
  * This class centralizes all the time related processing in
  * ACE.  These timers are typically used in conjunction with OS
@@ -3474,9 +3474,6 @@ typedef DWORD ACE_id_t;
 typedef int ACE_pri_t;
 
 // Dynamic loading-related types - used for dlopen and family.
-#   if !defined(RTLD_LAZY)
-#     define RTLD_LAZY 1
-#   endif /* !RTLD_LAZY */
 typedef HINSTANCE ACE_SHLIB_HANDLE;
 #   define ACE_SHLIB_INVALID_HANDLE 0
 #   define ACE_DEFAULT_SHLIB_MODE 0
@@ -3887,9 +3884,6 @@ extern "C" {
 #     endif /* ACE_HAS_DLFCN_H_BROKEN_EXTERN_C */
   typedef void *ACE_SHLIB_HANDLE;
 #   define ACE_SHLIB_INVALID_HANDLE 0
-#     if !defined (RTLD_LAZY)
-#       define RTLD_LAZY 1
-#     endif /* !RTLD_LAZY */
 #   if defined (__KCC) && defined(RTLD_GROUP) && defined(RTLD_NODELETE)
 #   define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GROUP | RTLD_NODELETE
 #   else
@@ -3905,15 +3899,24 @@ extern "C" {
 #   define ACE_SHLIB_INVALID_HANDLE 0
 #   define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED
 #   else
-#     if !defined(RTLD_LAZY)
-#       define RTLD_LAZY 1
-#     endif /* !RTLD_LAZY */
   typedef void *ACE_SHLIB_HANDLE;
 #   define ACE_SHLIB_INVALID_HANDLE 0
 #   define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY
 
 #   endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
 
+#if !defined (RTLD_LAZY)
+#define RTLD_LAZY 1
+#endif /* !RTLD_LAZY */
+
+#if !defined (RTLD_NOW)
+#define RTLD_NOW 2
+#endif /* !RTLD_NOW */
+
+#if !defined (RTLD_GLOBAL)
+#define RTLD_GLOBAL 3
+#endif /* !RTLD_GLOBAL */
+
 #   if defined (ACE_HAS_SOCKIO_H)
 #     include /**/ <sys/sockio.h>
 #   endif /* ACE_HAS_SOCKIO_ */
diff --git a/ace/OS.i b/ace/OS.i
index fe0a33506ed..13e9f681d67 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -1476,24 +1476,24 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
   // Only do these initializations if the <attributes> parameter
   // wasn't originally set.
   if (attributes == &l_attributes)
-  {
-    if (::pace_pthread_mutexattr_init (attributes) == 0)
-      result = 0;
-    else
-      result = -1;        // ACE_ADAPT_RETVAL used it for intermediate status
-  }
+    {
+      if (::pace_pthread_mutexattr_init (attributes) == 0)
+        result = 0;
+      else
+        result = -1;        // ACE_ADAPT_RETVAL used it for intermediate status
+    }
 
   if (result == 0)
-  {
-    if (
+    {
+      if (
 #     if defined (_POSIX_THREAD_PROCESS_SHARED)
-        ::pace_pthread_mutexattr_setpshared (attributes, type) == 0 &&
+          ::pace_pthread_mutexattr_setpshared (attributes, type) == 0 &&
 #     endif /* _POSIX_THREAD_PROCESS_SHARED */
-        ::pace_pthread_mutex_init (m, attributes) == 0)
-      result = 0;
-    else
-      result = -1;        // ACE_ADAPT_RETVAL used it for intermediate status
-  }
+          ::pace_pthread_mutex_init (m, attributes) == 0)
+        result = 0;
+      else
+        result = -1;        // ACE_ADAPT_RETVAL used it for intermediate status
+    }
   ACE_UNUSED_ARG (sa);
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (type);