ChangeLogTag:Mon Jun 25 15:36:55 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

10 files changed, 44 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index e756487a0fa..bdfb8046bde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 25 15:36:55 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-sunos5.7.h: Added support for GCC 3.0.  Thanks to
+	  Craig Ching <cching@mqsoftware.com> for contributing this.
+
 Mon Jun 25 12:18:41 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/aix_shr:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index e756487a0fa..bdfb8046bde 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Mon Jun 25 15:36:55 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-sunos5.7.h: Added support for GCC 3.0.  Thanks to
+	  Craig Ching <cching@mqsoftware.com> for contributing this.
+
 Mon Jun 25 12:18:41 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/aix_shr:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e756487a0fa..bdfb8046bde 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Mon Jun 25 15:36:55 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-sunos5.7.h: Added support for GCC 3.0.  Thanks to
+	  Craig Ching <cching@mqsoftware.com> for contributing this.
+
 Mon Jun 25 12:18:41 2001  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/aix_shr:
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
index 59f95be0468..9da4ae5fbe4 100644
--- a/TAO/docs/components.html
+++ b/TAO/docs/components.html
@@ -21,6 +21,13 @@ bgcolor="#ffffff">
 	These customizations can be done by an end-user and do not
         require C++ programming.<P>
 
+      <LI><A HREF="ORBEnpoint.html">ORB endpoint options</A> &shy;
+          Describes the options that TAO supports to enable
+          applications to specify which endpoints to use for
+          ORB-to-ORB communication.  These customizations can be done
+          by an end-user or application during ORB initialization and do not
+        require C++ programming.<P>
+
       <li><a href="configurations.html">Configuration</a> &shy;
       describes how to mix and match component <a
       href="Options.html">options</a> to customize 
diff --git a/ace/OS_TLI.h b/ace/OS_TLI.h
index c3aedc53bfb..14a58fb1e71 100644
--- a/ace/OS_TLI.h
+++ b/ace/OS_TLI.h
@@ -7,8 +7,6 @@
  *  $Id$
  *
  *  @author Doug Schmidt <schmidt@cs.wustl.edu>
- *  @author Jesper S. M|ller<stophph@diku.dk>
- *  @author and a cast of thousands...
  */
 //=============================================================================
 
@@ -24,8 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-# if defined (ACE_WIN32)
-// Win32 dummies to help compilation.
+# if !defined (ACE_HAS_TLI)
+// Dummies to help compilation.
 struct rlimit { };
 struct t_call { };
 struct t_bind { };
@@ -142,7 +140,7 @@ public:
                      struct
                      t_bind *ret);
   static int t_close (ACE_HANDLE fildes);
-  static int t_connect(int fildes,
+  static int t_connect(ACE_HANDLE fildes,
                        struct t_call *sndcall,
                        struct t_call *rcvcall);
   static void t_error (const char *errmsg);
diff --git a/ace/OS_TLI.inl b/ace/OS_TLI.inl
index 3d81223fd71..675affa365a 100644
--- a/ace/OS_TLI.inl
+++ b/ace/OS_TLI.inl
@@ -61,7 +61,7 @@ ACE_OS_TLI::t_close (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS_TLI::t_connect(int fildes,
+ACE_OS_TLI::t_connect(ACE_HANDLE fildes,
                       struct t_call *sndcall,
                       struct t_call *rcvcall)
 {
@@ -175,13 +175,13 @@ ACE_INLINE ACE_HANDLE
 ACE_OS_TLI::t_open (char *path, int oflag, struct t_info *info)
 {
 #if defined (ACE_HAS_TLI)
-  ACE_OSCALL_RETURN (::t_open (path, oflag, info), int, -1);
+  ACE_OSCALL_RETURN (::t_open (path, oflag, info), ACE_HANDLE, ACE_INVALID_HANDLE);
 #else
   ACE_UNUSED_ARG (path);
   ACE_UNUSED_ARG (oflag);
   ACE_UNUSED_ARG (info);
 
-  ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE);
+  ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_TLI */
 }
 
diff --git a/ace/TLI.cpp b/ace/TLI.cpp
index c57e9f5f2cb..e2ce3bad46c 100644
--- a/ace/TLI.cpp
+++ b/ace/TLI.cpp
@@ -74,8 +74,8 @@ ACE_TLI::~ACE_TLI (void)
 ACE_TLI::ACE_TLI (const char device[], int oflag, struct t_info *info)
 {
   ACE_TRACE ("ACE_TLI::ACE_TLI");
-  if (this->open (device, oflag, info) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("ACE_TLI::ACE_TLI")));
+  if (this->open (device, oflag, info) == ACE_INVALID_HANDLE)
+    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_TLI::ACE_TLI")));
 }
 
 int
@@ -103,7 +103,7 @@ int
 ACE_TLI::close (void)
 {
   ACE_TRACE ("ACE_TLI::close");
-  ACE_HANDLE result = 0;
+  int result = 0; // Geisler: result must be int
 
   if (this->get_handle () != ACE_INVALID_HANDLE)
     {
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index 2f81329fb55..4eb7258ab32 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -48,9 +48,9 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
 
   // Only open a new endpoint if we don't already have a valid handle.
 
-  if (new_stream.get_handle () == ACE_INVALID_HANDLE)
-    if (new_stream.open (device, flags, info) == -1)
-      return -1;
+  if (new_stream.get_handle () == ACE_INVALID_HANDLE
+      && new_stream.open (device, flags, info) == ACE_INVALID HANDLE)
+    return -1;
 
   if (local_sap != ACE_Addr::sap_any)
     {
diff --git a/ace/TLI_Connector.i b/ace/TLI_Connector.i
index 50e86fc1ce0..e40a1c2637c 100644
--- a/ace/TLI_Connector.i
+++ b/ace/TLI_Connector.i
@@ -29,9 +29,11 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
                      info,
                      rwf,
                      udata,
-                     opt) == ACE_INVALID_HANDLE
+                     opt) == -1
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream")));
+    ACE_ERROR ((LM_ERROR,
+                ACE_LIB_TEXT ("%p\n"),
+                ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream")));
 }
 
 ACE_INLINE
diff --git a/ace/config-sunos5.7.h b/ace/config-sunos5.7.h
index b7c2c1ecced..af9ec98a5ea 100644
--- a/ace/config-sunos5.7.h
+++ b/ace/config-sunos5.7.h
@@ -25,7 +25,12 @@
     typedef long          t_scalar_t;  /* historical versions */
     typedef unsigned long t_uscalar_t;
     typedef void          *timeout_id_t;
-# endif /* __GNUC__ <= 2  &&  __GNUC_MINOR__ < 8 */
+
+# elif __GNUC__ >= 3 && __GNUC_MINOR__ >= 0
+#   define ACE_HAS_SOCKLEN_T
+#   define ACE_HAS_POSIX_GETPWNAM_R
+#   define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#   define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 
 #elif defined (ghs)
   // SunOS 5.7's /usr/include/sys/procfs_isa.h needs uint64_t,