ChangeLogTag: Tue May 16 12:28:12 2006 UTC Johnny Willemsen <jwillemsen@remedy.nl>Fri May 12 11:26:12 2006 UTC Johnny Willemsen <jwillemsen@remedy.nl>Mon May 15 12:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>Tue May 16 12:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 14 insertions, 152 deletions

diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 78e0557c9a5..4f75a45b643 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -322,7 +322,7 @@ ACE_INET_Addr::set (u_short port_number,
                       encode);
   else
     {
-#  if (defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)) || defined (CHORUS)
+#  if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)
       hostent *hp = ACE_OS::gethostbyname (host_name);
 #  else
       hostent hentry;
@@ -795,7 +795,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const
           return -1;
         }
 #else
-#  if defined (CHORUS) || (defined (DIGITAL_UNIX) && defined (__GNUC__))
+#  if defined (DIGITAL_UNIX) && defined (__GNUC__)
       hostent *hp = ACE_OS::gethostbyaddr ((char *)this->ip_addr_pointer (),
                                            this->ip_addr_size (),
                                            this->get_type ());
@@ -810,7 +810,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const
                                  &hentry,
                                  buf,
                                  &h_error);
-#  endif /* CHORUS */
+#  endif /* DIGITAL_UNIX */
 
       if (hp == 0 || hp->h_name == 0)
         return -1;
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 6939a455acc..c4f8b7adaf9 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -2100,7 +2100,7 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
 #if !defined (ACE_WIN32)
       // Make this block signal-safe.
       ACE_Log_Msg_Sig_Guard sb;
-#endif /* !ACE_WIN32 && !ACE_PSOS */
+#endif /* !ACE_WIN32 */
 
       // Do the callback, if needed, before acquiring the lock
       // to avoid holding the lock during the callback so we don't
@@ -2616,14 +2616,6 @@ ACE_Log_Msg::init_hook (ACE_OS_Log_Msg_Attributes &attributes
     }
 }
 
-#if defined (ACE_THREADS_DONT_INHERIT_LOG_MSG)  || \
-    defined (ACE_HAS_MINIMAL_ACE_OS)
-# if defined (ACE_PSOS)
-// Unique file identifier
-static int ACE_PSOS_unique_file_id = 0;
-# endif /* ACE_PSOS */
-#endif /* ACE_THREADS_DONT_INHERIT_LOG_MSG) || ACE_HAS_MINIMAL_ACE_OS */
-
 void
 ACE_Log_Msg::inherit_hook (ACE_OS_Thread_Descriptor *thr_desc,
                            ACE_OS_Log_Msg_Attributes &attributes)
@@ -2660,20 +2652,6 @@ ACE_Log_Msg::inherit_hook (ACE_OS_Thread_Descriptor *thr_desc,
     new_log->thr_desc (static_cast<ACE_Thread_Descriptor *> (thr_desc));
   // Block the thread from proceeding until
   // thread manager has thread descriptor ready.
-
-# else  /* Don't inherit Log Msg */
-#  if defined (ACE_PSOS)
-  // Create a special name for each thread...
-  char new_name[MAXPATHLEN]={"Ace_thread-"};
-  char new_id[2]={0,0};  //Now it's pre-terminated!
-
-  new_id[0] = '0' + (ACE_PSOS_unique_file_id++);  //Unique identifier
-  ACE_OS::strcat(new_name, new_id);
-
-  // Initialize the task specific logger
-  ACE_LOG_MSG->open(new_name);
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) starting %s thread at %D\n"),new_name));
-#  endif /* ACE_PSOS */
 #endif /* ! ACE_THREADS_DONT_INHERIT_LOG_MSG  &&  ! ACE_HAS_MINIMAL_ACE_OS */
 }
 
diff --git a/ace/OS_NS_arpa_inet.cpp b/ace/OS_NS_arpa_inet.cpp
index 94c54edfe4f..128c3af33b4 100644
--- a/ace/OS_NS_arpa_inet.cpp
+++ b/ace/OS_NS_arpa_inet.cpp
@@ -50,23 +50,4 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr)
 #endif  /* ACE_LACKS_INET_ATON */
 }
 
-// All other platforms have this inlined in OS_NS_arpa_inet.inl
-#if defined (ACE_PSOS)
-char *
-ACE_OS::inet_ntoa (const struct in_addr addr)
-{
-  ACE_OS_TRACE ("ACE_OS::inet_ntoa");
-
-  static char addrstr[INET_ADDRSTRLEN + 1] = { 0 };
-  ACE_UINT32 ipaddr = ntohl (addr.s_addr);
-  //printf("Socket address %X, IP address %X.\n",addr.s_addr,ipaddr);
-  sprintf(addrstr, "%d.%d.%d.%d",
-          ((ipaddr & 0xff000000) >> 24) & 0x000000ff,
-          (ipaddr & 0x00ff0000) >> 16,
-          (ipaddr & 0x0000ff00) >> 8,
-          (ipaddr & 0x000000ff));
-  return addrstr;
-}
-#endif /* defined (ACE_PSOS) */
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_arpa_inet.h b/ace/OS_NS_arpa_inet.h
index 9b7a7028975..f1888432d3f 100644
--- a/ace/OS_NS_arpa_inet.h
+++ b/ace/OS_NS_arpa_inet.h
@@ -44,11 +44,7 @@ namespace ACE_OS {
   int inet_aton (const char *strptr,
                  struct in_addr *addr);
 
-#if !defined (ACE_PSOS)
   ACE_NAMESPACE_INLINE_FUNCTION
-#else
-  extern ACE_Export
-#endif /* ACE_PSOS */
   char *inet_ntoa (const struct in_addr addr);
 
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ace/OS_NS_arpa_inet.inl b/ace/OS_NS_arpa_inet.inl
index b81b2c88059..63774a1a5ef 100644
--- a/ace/OS_NS_arpa_inet.inl
+++ b/ace/OS_NS_arpa_inet.inl
@@ -11,48 +11,13 @@ ACE_INLINE unsigned long
 ACE_OS::inet_addr (const char *name)
 {
   ACE_OS_TRACE ("ACE_OS::inet_addr");
-#if defined (ACE_PSOS)
-
-  u_long ret = 0;
-  u_int segment;
-  u_int valid = 1;
-
-  for (u_int i = 0; i < 4; ++i)
-    {
-      ret <<= 8;
-      if (*name != '\0')
-        {
-          segment = 0;
-
-          while (*name >= '0'  &&  *name <= '9')
-            {
-              segment *= 10;
-              segment += *name++ - '0';
-            }
-          if (*name != '.' && *name != '\0')
-            {
-              valid = 0;
-              break;
-            }
-
-          ret |= segment;
-
-          if (*name == '.')
-            {
-              ++name;
-            }
-        }
-    }
-  return valid ? htonl (ret) : INADDR_NONE;
-#elif defined (ACE_HAS_NONCONST_GETBY)
+#if defined (ACE_HAS_NONCONST_GETBY)
   return ::inet_addr (const_cast <char*> (name));
 #else
   return ::inet_addr (name);
 #endif /* ACE_HAS_NONCONST_GETBY */
 }
 
-// For pSOS, this function is in OS.cpp
-#if !defined (ACE_PSOS)
 ACE_INLINE char *
 ACE_OS::inet_ntoa (const struct in_addr addr)
 {
@@ -61,7 +26,6 @@ ACE_OS::inet_ntoa (const struct in_addr addr)
                      char *,
                      0);
 }
-#endif /* defined (ACE_PSOS) */
 
 ACE_INLINE const char *
 ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
diff --git a/ace/OS_NS_dirent.inl b/ace/OS_NS_dirent.inl
index ff562717cb9..dbd8a65e4e3 100644
--- a/ace/OS_NS_dirent.inl
+++ b/ace/OS_NS_dirent.inl
@@ -13,26 +13,16 @@ ACE_INLINE void
 closedir (ACE_DIR *d)
 {
 #if defined (ACE_HAS_DIRENT)
-# if defined (ACE_PSOS)
-
-  u_long result = ::close_dir (&(d->xdir));
-  delete d;
-  if (result != 0)
-    errno = result;
-
-# else /* ! ACE_PSOS */
-
-#   if defined (ACE_WIN32) && defined (ACE_LACKS_CLOSEDIR)
+# if defined (ACE_WIN32) && defined (ACE_LACKS_CLOSEDIR)
   ACE_OS::closedir_emulation (d);
   delete [] d->directory_name_;
   delete d;
-#  elif defined (ACE_HAS_WCLOSEDIR) && defined (ACE_USES_WCHAR)
+# elif defined (ACE_HAS_WCLOSEDIR) && defined (ACE_USES_WCHAR)
   ::wclosedir (d);
-#   else /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */
+# else /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */
   ::closedir (d);
-#   endif /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */
+# endif /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */
 
-# endif /* ACE_PSOS */
 #else /* ACE_HAS_DIRENT */
   ACE_UNUSED_ARG (d);
 #endif /* ACE_HAS_DIRENT */
@@ -42,21 +32,6 @@ ACE_INLINE ACE_DIR *
 opendir (const ACE_TCHAR *filename)
 {
 #if defined (ACE_HAS_DIRENT)
-#  if defined (ACE_PSOS)
-  // The pointer to the <ACE_DIR> buffer *must* be passed to
-  // <ACE_OS::closedir> to free it and avoid a memory leak.
-  ACE_DIR *dir = 0;
-  u_long result;
-  ACE_NEW_RETURN (dir, ACE_DIR, 0);
-  result = ::open_dir (const_cast<ACE_TCHAR *> (filename), &dir->xdir);
-  if (result == 0)
-    return dir;
-  else
-    {
-      errno = result;
-      return 0;
-    }
-#  else /* ! ACE_PSOS */
 #    if defined (ACE_WIN32) && defined (ACE_LACKS_OPENDIR)
   return ::ACE_OS::opendir_emulation (filename);
 #  elif defined (ACE_HAS_WOPENDIR) && defined (ACE_USES_WCHAR)
@@ -66,7 +41,6 @@ opendir (const ACE_TCHAR *filename)
 #    else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */
   return ::opendir (ACE_TEXT_ALWAYS_CHAR (filename));
 #    endif /* ACE_WIN32 && ACE_LACKS_OPENDIR */
-#  endif /* ACE_PSOS */
 #else
   ACE_UNUSED_ARG (filename);
   ACE_NOTSUP_RETURN (0);
@@ -78,18 +52,6 @@ struct ACE_DIRENT *
 readdir (ACE_DIR *d)
 {
 #if defined (ACE_HAS_DIRENT)
-#  if defined (ACE_PSOS)
-
-  u_long result = ::read_dir (&d->xdir, &d->dirent);
-  if (0 == result)
-    return &d->dirent;
-  else
-    {
-      errno = result;
-      return 0;
-    }
-
-#  else /* ! ACE_PSOS */
 #    if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR)
   return ACE_OS::readdir_emulation (d);
 #  elif defined (ACE_HAS_WREADDIR) && defined (ACE_USES_WCHAR)
@@ -97,7 +59,6 @@ readdir (ACE_DIR *d)
 #    else /* ACE_WIN32 && ACE_LACKS_READDIR */
   return ::readdir (d);
 #    endif /* ACE_WIN32 && ACE_LACKS_READDIR */
-#  endif /* ACE_PSOS */
 #else
   ACE_UNUSED_ARG (d);
   ACE_NOTSUP_RETURN (0);
diff --git a/ace/Unbounded_Queue.h b/ace/Unbounded_Queue.h
index 39314168da8..ae70125ffbd 100644
--- a/ace/Unbounded_Queue.h
+++ b/ace/Unbounded_Queue.h
@@ -20,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// For size_t under Chorus
 #include "ace/os_include/os_stddef.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ace/config-cray.h b/ace/config-cray.h
index 4ebb1ad830a..6b9977895d8 100644
--- a/ace/config-cray.h
+++ b/ace/config-cray.h
@@ -41,9 +41,6 @@
 
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
-// using cray's autoinstantiation gives C++ prelinker: error: instantiation loop
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
 #define ACE_HAS_SSIZE_T
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 38c5fe91bb0..4c84347ab82 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -39,7 +39,7 @@
 // The following configuration section is designed to work for HP
 // platforms running HP/UX 11.x with either of the HP C++ compilers.
 // There isn't a predefined macro for all cases of the compilers that
-// can be used to tell them apart from other compilers (e.g. __KCC, etc.)
+// can be used to tell them apart from other compilers
 // only to tell C++ from aC++, using the value of __cplusplus.
 //
 // NOTE - HP advises people on 11.x to use aC++ since the older C++ doesn't
@@ -75,7 +75,7 @@
 // macro is not set until A.03.13. If it's not set, set it - it won't be an
 // HP-advertised value, but we don't check the value/version - just whether
 // it's set or not.
-#    if !defined (__KCC) && !defined (__HP_aCC)
+#    if !defined (__HP_aCC)
 #      define __HP_aCC
 #    endif /* __HP_aCC */
 
@@ -160,12 +160,6 @@
 
 #endif /* __GNUG__, HP */
 
-// KCC Specific Section
-#if defined(__KCC)
-#  include "ace/config-kcc-common.h"
-#  undef ACE_CC_PREPROCESSOR_ARGS
-#endif
-
 //*********************************************************************
 //
 // From here down is the compiler-INdependent OS settings.
diff --git a/ace/config-macros.h b/ace/config-macros.h
index 88305918721..263093e2d56 100644
--- a/ace/config-macros.h
+++ b/ace/config-macros.h
@@ -133,7 +133,7 @@
 # endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS */
 
 # if !defined (ACE_HAS_PROCESS_SPAWN)
-#   if !defined (ACE_LACKS_FORK) || defined (ACE_WIN32) || defined (ACE_WINCE) || defined (ACE_OPENVMS) || defined (CHORUS)
+#   if !defined (ACE_LACKS_FORK) || defined (ACE_WIN32) || defined (ACE_WINCE) || defined (ACE_OPENVMS)
 #     define ACE_HAS_PROCESS_SPAWN 1
 #   endif
 # endif /* ACE_HAS_PROCESS_SPAWN */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 2be213db3af..4fc3b5f4c5c 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -64,14 +64,11 @@
 # define ACE_HAS_STDCPP_STL_INCLUDES
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
 # define ACE_HAS_TYPENAME_KEYWORD
-#elif defined (__KCC)
-# define ACE_HAS_STRING_CLASS
-# include "ace/config-kcc-common.h"
 #else
 #  ifdef __cplusplus  /* Let it slide for C compilers. */
 #   error unsupported compiler on Digital Unix
 #  endif  /* __cplusplus */
-#endif /* ! __GNUG__ && ! __DECCXX && ! __rational__ && !_KCC */
+#endif /* ! __GNUG__ && ! __DECCXX && ! __rational__ */
 
 #if (DIGITAL_UNIX >= 0x400) && (DIGITAL_UNIX < 0x500)
 #define ACE_LACKS_PREAD_PROTOTYPE
diff --git a/ace/config-rtems.h b/ace/config-rtems.h
index cb93a725dec..171feab0c01 100644
--- a/ace/config-rtems.h
+++ b/ace/config-rtems.h
@@ -31,9 +31,6 @@
   // this must appear before its #include.
 # define ACE_HAS_STRING_CLASS
 # include "ace/config-g-common.h"
-#elif defined (__KCC)
-# define ACE_HAS_STRING_CLASS
-# include "ace/config-kcc-common.h"
 #elif defined (__DECCXX)
 # define ACE_CONFIG_INCLUDE_CXX_COMMON
 # include "ace/config-cxx-common.h"
diff --git a/ace/config-sunos5.7.h b/ace/config-sunos5.7.h
index 17b5ec18e28..5e8b21a6469 100644
--- a/ace/config-sunos5.7.h
+++ b/ace/config-sunos5.7.h
@@ -40,12 +40,10 @@
 # undef ACE_HAS_PROC_FS
 # undef ACE_HAS_PRUSAGE_T
 
-#elif defined (__KCC)
-typedef unsigned long long uint64_t;
 #elif defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x530)
   // Wide character methods are in std:: when using SunCC 5.3
 # define ACE_WCHAR_IN_STD_NAMESPACE
-#endif /* __GNUG__ || ghs || __KCC */
+#endif /* __GNUG__ || ghs */
 
 // SunOS 5.7 supports SCHED_FIFO and SCHED_RR, as well as SCHED_OTHER.
 #undef ACE_HAS_ONLY_SCHED_OTHER