Wed Jun 27 06:09:39 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

21 files changed, 66 insertions, 59 deletions

diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp
index 22ceaf66634..70952568586 100644
--- a/ACE/ace/Handle_Set.cpp
+++ b/ACE/ace/Handle_Set.cpp
@@ -101,7 +101,7 @@ ACE_Handle_Set::ACE_Handle_Set (void)
   this->reset ();
 }
 
-ACE_Handle_Set::ACE_Handle_Set (const ACE_FD_SET_TYPE &fd_mask)
+ACE_Handle_Set::ACE_Handle_Set (const fd_set &fd_mask)
 {
   ACE_TRACE ("ACE_Handle_Set::ACE_Handle_Set");
   this->reset ();
diff --git a/ACE/ace/Handle_Set.h b/ACE/ace/Handle_Set.h
index 215fffe09b4..90c7713a7c3 100644
--- a/ACE/ace/Handle_Set.h
+++ b/ACE/ace/Handle_Set.h
@@ -68,10 +68,8 @@ public:
 
   /**
    * Constructor, initializes the handle set from a given mask.
-   * <ACE_FD_SET_TYPE> is a <typedef> based on the platform's native
-   * type used for masks passed to <select>.
    */
-  ACE_Handle_Set (const ACE_FD_SET_TYPE &mask);
+  ACE_Handle_Set (const fd_set &mask);
 
   // = Methods for manipulating bitsets.
   /// Initialize the bitmask to all 0s and reset the associated fields.
diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp
index 1d6aea09359..e08f7c4ed7a 100644
--- a/ACE/ace/Log_Record.cpp
+++ b/ACE/ace/Log_Record.cpp
@@ -291,19 +291,23 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
       ACE_TCHAR *verbose_msg = 0;
       ACE_NEW_RETURN (verbose_msg, ACE_TCHAR[MAXVERBOSELOGMSGLEN], -1);
 
-      int result = this->format_msg (host_name,
-                                     verbose_flag,
-                                     verbose_msg);
+      int result = this->format_msg (host_name, verbose_flag, verbose_msg);
 
       if (result == 0)
         {
           if (fp != 0)
             {
-              int verbose_msg_len =
+              int const verbose_msg_len =
                 static_cast<int> (ACE_OS::strlen (verbose_msg));
-              int fwrite_result = ACE_OS::fprintf (fp,
-                                                   ACE_LIB_TEXT ("%s"),
-                                                   verbose_msg);
+#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+              int const fwrite_result = ACE_OS::fprintf (fp,
+                                                         ACE_LIB_TEXT ("%ls"),
+                                                         verbose_msg);
+#else
+              int const fwrite_result = ACE_OS::fprintf (fp,
+                                                         ACE_LIB_TEXT ("%s"),
+                                                         verbose_msg);
+#endif
               // We should have written everything
               if (fwrite_result != verbose_msg_len)
                 result = -1;
diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl
index 0b8c8db533e..83b00bd0b2c 100644
--- a/ACE/ace/OS_NS_sys_mman.inl
+++ b/ACE/ace/OS_NS_sys_mman.inl
@@ -240,7 +240,7 @@ ACE_OS::shm_open (const ACE_TCHAR *filename,
   ACE_OS_TRACE ("ACE_OS::shm_open");
 #if defined (ACE_HAS_SHM_OPEN)
   ACE_UNUSED_ARG (sa);
-#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x650)
   // With VxWorks the file should just start with / and no other
   // slashes, so replace all other / by _
   ACE_TCHAR buf [MAXPATHLEN + 1];
@@ -270,7 +270,7 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path)
 {
   ACE_OS_TRACE ("ACE_OS::shm_unlink");
 #if defined (ACE_HAS_SHM_OPEN)
-#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640)
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x650)
   // With VxWorks the file should just start with / and no other
   // slashes, so replace all other / by _
   ACE_TCHAR buf [MAXPATHLEN + 1];
diff --git a/ACE/ace/OS_NS_sys_select.inl b/ACE/ace/OS_NS_sys_select.inl
index 25890b81696..d905837d992 100644
--- a/ACE/ace/OS_NS_sys_select.inl
+++ b/ACE/ace/OS_NS_sys_select.inl
@@ -39,18 +39,10 @@ ACE_OS::select (int width,
   ACE_UNUSED_ARG (timeout);
   ACE_NOTSUP_RETURN (-1);
 #elif defined(ACE_TANDEM_T1248_PTHREADS)
-  ACE_SOCKCALL_RETURN (::spt_select (width,
-                                 (ACE_FD_SET_TYPE *) rfds,
-                                 (ACE_FD_SET_TYPE *) wfds,
-                                 (ACE_FD_SET_TYPE *) efds,
-                                 timep),
+  ACE_SOCKCALL_RETURN (::spt_select (width, rfds, wfds, efds, timep),
                        int, -1);
 #else
-  ACE_SOCKCALL_RETURN (::select (width,
-                                 (ACE_FD_SET_TYPE *) rfds,
-                                 (ACE_FD_SET_TYPE *) wfds,
-                                 (ACE_FD_SET_TYPE *) efds,
-                                 timep),
+  ACE_SOCKCALL_RETURN (::select (width, rfds, wfds, efds, timep),
                        int, -1);
 #endif
 }
@@ -76,18 +68,10 @@ ACE_OS::select (int width,
   ACE_UNUSED_ARG (timeout);
   ACE_NOTSUP_RETURN (-1);
 #elif defined(ACE_TANDEM_T1248_PTHREADS)
-  ACE_SOCKCALL_RETURN (::spt_select (width,
-                                 (ACE_FD_SET_TYPE *) rfds,
-                                 (ACE_FD_SET_TYPE *) wfds,
-                                 (ACE_FD_SET_TYPE *) efds,
-                                 ___ACE_TIMEOUT),
+  ACE_SOCKCALL_RETURN (::spt_select (width, rfds, wfds, efds, ___ACE_TIMEOUT),
                        int, -1);
 #else
-  ACE_SOCKCALL_RETURN (::select (width,
-                                 (ACE_FD_SET_TYPE *) rfds,
-                                 (ACE_FD_SET_TYPE *) wfds,
-                                 (ACE_FD_SET_TYPE *) efds,
-                                 ___ACE_TIMEOUT),
+  ACE_SOCKCALL_RETURN (::select (width, rfds, wfds, efds, ___ACE_TIMEOUT),
                        int, -1);
 #endif
 #undef ___ACE_TIMEOUT
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index eabc65e4f00..3ffb57f2366 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -21,7 +21,7 @@
 
 #if defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE)
 #  include "ace/os_include/os_unistd.h"
-#  if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640))
+#  if defined (ACE_VXWORKS) && ((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x650))
 #    if defined (__RTP__)
 #      include "ace/os_include/os_strings.h"
 #    else
diff --git a/ACE/ace/README b/ACE/ace/README
index 94a3deb6113..b8250a70a31 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -80,8 +80,6 @@ ACE_PAGE_SIZE                           Defines the page size of the
                                         system (not used on Win32 or
                                         with ACE_HAS_GETPAGESIZE).
 ACE_REDEFINES_XTI_FUNCTIONS             Platform redefines the t_... names (UnixWare)
-ACE_SELECT_USES_INT                     Platform uses int for select()
-                                        rather than fd_set
 ACE_TEMPLATES_REQUIRE_PRAGMA            Compiler's template mechanism
                                         must use a pragma This is used
                                         for AIX's C++ compiler.
@@ -91,9 +89,9 @@ ACE_TEMPLATES_REQUIRE_SOURCE            Compiler's template mechanim
                                         GNU G++.
 ACE_TIMEPROBE_ASSERTS_FIXED_SIZE        If enabled then ACE_Timeprobe_Ex<>::timeprobe()
                                         will assert if the end of the
-                                        buffer is reached.  If disabled, the 
+                                        buffer is reached.  If disabled, the
                                         counter wraps around to start
-                                        at the beginning of the buffer.  
+                                        at the beginning of the buffer.
 ACE_TIMER_SKEW                          If a timed ::select () can return
                                         early, then ACE_TIMER_SKEW is the
                                         maximum adjustment, in microseconds,
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index 6578e9a25d2..e58401bdcb7 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -359,7 +359,7 @@ ACE_SOCK_Dgram::send (const iovec iov[],
 #endif
       length += iov[i].iov_len;
 
-  char *buf;
+  char *buf = 0;
 
 #if defined (ACE_HAS_ALLOCA)
   buf = alloca (length);
@@ -408,7 +408,7 @@ ACE_SOCK_Dgram::recv (iovec iov[],
 #endif
       length += iov[i].iov_len;
 
-  char *buf;
+  char *buf = 0;
 
 #if defined (ACE_HAS_ALLOCA)
   buf = alloca (length);
diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp
index c1af2cdb105..de3678fee4d 100644
--- a/ACE/ace/Svc_Handler.cpp
+++ b/ACE/ace/Svc_Handler.cpp
@@ -21,8 +21,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <PR_ST_1, ACE_SYNCH_DECL> void *
-ACE_Svc_Handler<PR_ST_2,  ACE_SYNCH_USE>::operator new (size_t,
-                                                        void *p)
+ACE_Svc_Handler<PR_ST_2,  ACE_SYNCH_USE>::operator new (size_t, void *p)
 {
   ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (NOOP, 2 parameters)");
   return p;
@@ -30,8 +29,7 @@ ACE_Svc_Handler<PR_ST_2,  ACE_SYNCH_USE>::operator new (size_t,
 
 #if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
 template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *,
-                                                          void *)
+ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *, void *)
 {
   ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (NOOP, 2 parameters)");
   return;
@@ -154,7 +152,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Svc_Handler (ACE_Thread_Manager *tm
   // class.
   this->dynamic_ = ACE_Dynamic::instance ()->is_dynamic ();
 
-  if (this->dynamic_ != 0)
+  if (this->dynamic_)
     // Make sure to reset the flag.
     ACE_Dynamic::instance ()->reset ();
 }
diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h
index 0a8e051ac15..263515146ff 100644
--- a/ACE/ace/Svc_Handler.h
+++ b/ACE/ace/Svc_Handler.h
@@ -163,8 +163,7 @@ public:
 #endif
 
   /// This operator permits "placement new" on a per-object basis.
-  void * operator new (size_t n,
-                       void *p);
+  void * operator new (size_t n, void *p);
 
   /**
    * Call this to free up dynamically allocated <Svc_Handlers>
@@ -232,7 +231,7 @@ protected:
   ACE_PEER_STREAM peer_;
 
   /// Have we been dynamically created?
-  int dynamic_;
+  bool dynamic_;
 
   /// Keeps track of whether we are in the process of closing (required
   /// to avoid circular calls to <handle_close>).
diff --git a/ACE/ace/config-borland-common.h b/ACE/ace/config-borland-common.h
index 3e082e86446..a97138fcee5 100644
--- a/ACE/ace/config-borland-common.h
+++ b/ACE/ace/config-borland-common.h
@@ -57,7 +57,9 @@
 # define ACE_LACKS_ACE_IOSTREAM 1
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 # define ACE_LACKS_STRPTIME 1
-# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
+# if (__BORLANDC__ < 0x590)
+#   define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
+# endif
 # define ACE_LACKS_PRAGMA_ONCE 1
 # define ACE_HAS_NEW_NOTHROW
 # define ACE_TEMPLATES_REQUIRE_SOURCE 1
diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h
index e9114441092..82d7a76b678 100644
--- a/ACE/ace/config-freebsd.h
+++ b/ACE/ace/config-freebsd.h
@@ -135,7 +135,7 @@ extern "C" { char * cuserid (char *s); }
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_LACKS_SIGINFO_H
-
+#define ACE_LACKS_LOG2
 #define ACE_LACKS_SI_ADDR
 
 // Compiler/platform supports SVR4 signal typedef
diff --git a/ACE/ace/config-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h
index f34ed402fc3..efa8a2e5915 100644
--- a/ACE/ace/config-vxworks5.x.h
+++ b/ACE/ace/config-vxworks5.x.h
@@ -120,6 +120,8 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 #define ACE_HAS_STRDUP_EMULATION
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h
index 41963dad605..21335ad1e18 100644
--- a/ACE/ace/config-vxworks6.2.h
+++ b/ACE/ace/config-vxworks6.2.h
@@ -99,6 +99,8 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h
index 504e39d6a81..c44015a949b 100644
--- a/ACE/ace/config-vxworks6.3.h
+++ b/ACE/ace/config-vxworks6.3.h
@@ -79,6 +79,8 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index 5d553d33d20..df8300a8570 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -4,6 +4,7 @@
 // The following configuration file is designed to work for VxWorks
 // 6.4 platforms using one of these compilers:
 // 1) The GNU g++ compiler that is shipped with VxWorks 6.4
+// 2) The Diab compiler that is shipped with VxWorks 6.4
 
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
@@ -104,6 +105,8 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SOCKADDR_IN_SIN_LEN
+#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
diff --git a/ACE/ace/config-vxworks6.5.h b/ACE/ace/config-vxworks6.5.h
new file mode 100644
index 00000000000..0c3b712741f
--- /dev/null
+++ b/ACE/ace/config-vxworks6.5.h
@@ -0,0 +1,21 @@
+//* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for VxWorks
+// 6.5 platforms using one of these compilers:
+// 1) The GNU g++ compiler that is shipped with VxWorks 6.5
+// 2) The Diab compiler that is shipped with VxWorks 6.5
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+#include /**/ "ace/pre.h"
+
+#if !defined (ACE_VXWORKS)
+# define ACE_VXWORKS 0x650
+#endif /* ! ACE_VXWORKS */
+
+#include "ace/config-vxworks6.4"
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_H */
+
diff --git a/ACE/ace/os_include/os_limits.h b/ACE/ace/os_include/os_limits.h
index ea66cdefd93..61430536f31 100644
--- a/ACE/ace/os_include/os_limits.h
+++ b/ACE/ace/os_include/os_limits.h
@@ -102,7 +102,7 @@ extern "C"
 #  define ACE_IOV_MAX IOV_MAX
 #endif /* ACE_IOV_MAX */
 
-#if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640)) && !defined (__RTP__)
+#if defined (ACE_VXWORKS) && ((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x640)) && !defined (__RTP__)
 #  if defined (PIPE_BUF) && (PIPE_BUF == -1)
 #    undef PIPE_BUF
 #  endif
diff --git a/ACE/ace/os_include/os_stdio.h b/ACE/ace/os_include/os_stdio.h
index 35724eefd66..a2de931cfee 100644
--- a/ACE/ace/os_include/os_stdio.h
+++ b/ACE/ace/os_include/os_stdio.h
@@ -37,7 +37,7 @@
 #  include /**/ <ioLib.h>
 // for remCurIdGet()
 #  include /**/ <remLib.h>
-#  if defined (__RTP__) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640))
+#  if defined (__RTP__) && ((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x650))
 #    define L_cuserid       _PARM_L_cuserid
 #  endif
 #endif /* ACE_VXWORKS */
diff --git a/ACE/ace/os_include/sys/os_select.h b/ACE/ace/os_include/sys/os_select.h
index c6aa0e2ad3c..a8de27cbba8 100644
--- a/ACE/ace/os_include/sys/os_select.h
+++ b/ACE/ace/os_include/sys/os_select.h
@@ -51,12 +51,6 @@ extern "C"
 #  endif /* ! NFDBITS */
 #endif /* ACE_WIN32 */
 
-#if defined (ACE_SELECT_USES_INT)
-   typedef int ACE_FD_SET_TYPE;
-#else
-   typedef fd_set ACE_FD_SET_TYPE;
-#endif /* ACE_SELECT_USES_INT */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h
index ad975aa2f8a..36be32cf5ec 100644
--- a/ACE/ace/os_include/sys/os_types.h
+++ b/ACE/ace/os_include/sys/os_types.h
@@ -89,7 +89,7 @@ typedef double ACE_timer_t;
    typedef offset_t ACE_LOFF_T;
 #elif defined (WIN32)
    typedef __int64  ACE_LOFF_T;
-#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x640 || ACE_VXWORKS == 0x630 || ACE_VXWORKS == 0x620 || ACE_VXWORKS == 0x551)) || \
+#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x650)) || \
   defined (ACE_LYNXOS_MAJOR) || \
   (defined (ACE_OPENVMS) && !defined (_LARGEFILE))
    typedef long long ACE_LOFF_T;