diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-01-15 11:01:49 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-01-15 11:01:49 +0100 |
| commit | b30753f1a1b18c831e89223ec01db66231b5a64a (patch) | |
| tree | 8839fc17461b7ec6e0bc2c0f9568dd0dba9c9fe8 | |
| parent | 6f36dbed40cbedb60f2c40376d360c704d7db93b (diff) | |
| download | ATCD-b30753f1a1b18c831e89223ec01db66231b5a64a.tar.gz | |
Removed HPUX support
119 files changed, 61 insertions, 1583 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index 4de06ce5125..c7366c4cce3 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -185,7 +185,7 @@ document</a>.</p><p> Cygwin, VxWorks 6.x (kernel and rtp), BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS, - HPUX on IA64, and Android. + and Android. The Intel C++ compiler is supported on Windows 32/64bit, Linux IA32/EM64T/IA64, MacOSX. </td> diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 2376de0f58d..e276cc6d4c2 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -59,9 +59,6 @@ ACE::out_of_handles (int error) #if defined (ACE_WIN32) // On Win32, we need to check for ENOBUFS also. error == ENOBUFS || -#elif defined (HPUX) - // On HPUX, we need to check for EADDRNOTAVAIL also. - error == EADDRNOTAVAIL || #elif defined (ACE_LINUX) // On linux, we need to check for ENOENT also. error == ENOENT || diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index 0a9a36ec597..5c7b15e4072 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -216,7 +216,7 @@ ACE::sendv_n (ACE_HANDLE handle, ACE_INLINE ssize_t ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len) { -#if defined (ACE_WIN32) || defined (HPUX) || defined (ACE_MQX) +#if defined (ACE_WIN32) || defined (ACE_MQX) return ACE_OS::send (handle, (const char *) buf, len); #else return ACE_OS::write (handle, (const char *) buf, len); diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index fce2426fd5c..cccde07113f 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -266,12 +266,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL #else /* ! BYTE_ORDER && ! __BYTE_ORDER */ // We weren't explicitly told, so we have to figure it out . . . // Note that Itanium hardware (IA64) can run in either byte order. It's - // selected by the OS when loading; Windows runs little, HP-UX runs big. + // selected by the OS when loading; Windows runs little. # if defined (i386) || defined (__i386__) || defined (_M_IX86) || \ defined (vax) || defined (__LITTLE_ENDIAN__) || \ defined (ARM) || defined (_M_IA64) || defined (_M_AMD64) || \ defined (__amd64) || \ - ((defined (__ia64__) || defined (__ia64)) && !defined (__hpux)) + ((defined (__ia64__) || defined (__ia64))) // We know these are little endian. # define ACE_LITTLE_ENDIAN 0x0123 # define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index 84085cf4482..277f3d0779d 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -264,7 +264,7 @@ public: // VxWorks' compiler (gcc 2.96) gets confused by the operator long // double, so we avoid using long double as the NativeImpl. // Linux's x86 long double format (12 or 16 bytes) is incompatible - // with Windows, Solaris, AIX, MacOS X and HP-UX (and probably others) + // with Windows, Solaris, AIX, and MacOS X (and probably others) // long double format (8 or 16 bytes). If you need 32-bit Linux to // inter-operate with 64-bit Linux you will want to define this // macro to 0 so that "long double" is used. Otherwise, do not define diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index f1e3e03342e..dc9265414ea 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -13,8 +13,6 @@ # if defined (ACE_HAS_DEV_POLL) # if defined (ACE_LINUX) # include /**/ <linux/devpoll.h> -# elif defined (HPUX_VERS) && HPUX_VERS < 1123 -# include /**/ <devpoll.h> # else # include /**/ <sys/devpoll.h> # endif /* ACE_LINUX */ diff --git a/ACE/ace/ETCL/ETCL_y.cpp b/ACE/ace/ETCL/ETCL_y.cpp index 15e2c0116c2..37321652c84 100644 --- a/ACE/ace/ETCL/ETCL_y.cpp +++ b/ACE/ace/ETCL/ETCL_y.cpp @@ -351,13 +351,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #pragma alloca #define YYSTACK_USE_ALLOCA #else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ #endif /* not sparc */ diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index db78a8203ca..dd7e904b36e 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -1395,11 +1395,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # if defined (ACE_WIN32) // Windows uses 'c' for a wide character ACE_OS::strcpy (fp, ACE_TEXT ("c")); # else // Other platforms behave differently -# if defined (HPUX) // HP-Unix compatible - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else // Other ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ # endif # else /* ACE_USES_WCHAR */ @@ -1817,9 +1813,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { #if defined (ACE_HAS_WCHAR) wchar_t *wchar_str = va_arg (argp, wchar_t *); -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("S")); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) ACE_OS::strcpy (fp, ACE_TEXT ("s")); # else /* ACE_USES_WCHAR */ @@ -1827,7 +1821,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # endif /* ACE_USES_WCHAR */ # else ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -# endif /* HPUX */ +# endif /* ACE_HAS_WCHAR */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)")); @@ -1853,11 +1847,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, this_len = ACE_OS::sprintf (bp, format, va_arg (argp, int)); #elif defined (ACE_USES_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, va_arg (argp, wint_t)); @@ -1889,11 +1879,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::strcpy (fp, ACE_TEXT ("C")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_USES_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ #else /* ACE_WIN32 */ ACE_OS::strcpy (fp, ACE_TEXT ("u")); #endif /* ACE_WIN32 */ @@ -1936,11 +1922,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::strcpy (fp, ACE_TEXT ("S")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_HAS_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("S")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -# endif /* HPUX */ #endif /* ACE_WIN32 / ACE_HAS_WCHAR */ if (can_check) this_len = ACE_OS::snprintf @@ -2513,7 +2495,7 @@ bool ACE_Log_Formatter::process_conversion () ACE_OS::strcpy (this->fp_, "ls"); return false; case 'Z': -#if (defined ACE_WIN32 && !defined ACE_USES_WCHAR) || defined HPUX +#if (defined ACE_WIN32 && !defined ACE_USES_WCHAR) ACE_OS::strcpy (this->fp_, "S"); #elif defined ACE_WIN32 ACE_OS::strcpy (this->fp_, "s"); diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index c336a0d8fde..23f2558de3a 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -476,17 +476,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open () 0, this->cb_ptr_); - // Why aC++ in 64-bit mode can't grok this, I have no - // idea... but it ends up with an extra bit set which makes - // size_ really big without this hack. -#if defined (__hpux) && defined (__LP64__) - size_t hpux11_hack = (rounded_bytes - sizeof *this->cb_ptr_) - / sizeof (MALLOC_HEADER); - p->size_ = hpux11_hack; -#else - p->size_ = (rounded_bytes - sizeof *this->cb_ptr_) - / sizeof (MALLOC_HEADER); -#endif /* (__hpux) && defined (__LP64__) */ + p->size_ = (rounded_bytes - sizeof *this->cb_ptr_) / sizeof (MALLOC_HEADER); ACE_MALLOC_STATS (++this->cb_ptr_->malloc_stats_.nchunks_); ACE_MALLOC_STATS (++this->cb_ptr_->malloc_stats_.nblocks_); diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index fb6aa2860a6..af1ff53ab0d 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -421,7 +421,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, result), int, result); // We need to adjust this to make the POSIX and Solaris return - // values consistent. EAGAIN is from Pthreads DRAFT4 (HP-UX 10.20 and down) + // values consistent. EAGAIN is from Pthreads DRAFT4 if (result == -1 && (errno == ETIMEDOUT || errno == EAGAIN)) errno = ETIME; @@ -1601,8 +1601,8 @@ ACE_OS::sema_init (ACE_sema_t *s, # else if (name) { -# if defined (sun) || defined (HPUX) - // Solaris and HP-UX require the name to start with a slash. Solaris +# if defined (sun) + // Solaris require the name to start with a slash. Solaris // further requires that there be no other slashes than the first. const char *last_slash = ACE_OS::strrchr (name, '/'); char name2[MAXPATHLEN]; @@ -1616,7 +1616,7 @@ ACE_OS::sema_init (ACE_sema_t *s, else name = last_slash; // Chop off chars preceding last slash # endif /* sun */ -# endif /* sun || HPUX */ +# endif /* sun */ ACE_ALLOCATOR_RETURN (s->name_, ACE_OS::strdup (name), diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index 93f09f91229..b9928e2936a 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -40,22 +40,6 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) return ::dlclose (handle); #elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FreeLibrary (handle), ace_result_), int, -1); -#elif defined (__hpux) - // HP-UX 10.x and 32-bit 11.00 do not pay attention to the ref count - // when unloading a dynamic lib. So, if the ref count is more than - // 1, do not unload the lib. This will cause a library loaded more - // than once to not be unloaded until the process runs down, but - // that's life. It's better than unloading a library that's in use. - // So far as I know, there's no way to decrement the refcnt that the - // kernel is looking at - the shl_descriptor is a copy of what the - // kernel has, not the actual struct. On 64-bit HP-UX using dlopen, - // this problem has been fixed. - struct shl_descriptor desc; - if (shl_gethandle_r (handle, &desc) == -1) - return -1; - if (desc.ref_count > 1) - return 0; - return ::shl_unload (handle); #else ACE_UNUSED_ARG (handle); ACE_NOTSUP_RETURN (-1); @@ -79,7 +63,7 @@ ACE_OS::dlerror () # else return const_cast <char *> (err); # endif /* ACE_USES_WCHAR */ -# elif defined (__hpux) || defined (ACE_VXWORKS) +# elif defined (ACE_VXWORKS) //FUZZ: disable check_for_lack_ACE_OS return ::strerror(errno); //FUZZ: enable check_for_lack_ACE_OS @@ -133,8 +117,6 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, ACE_UNUSED_ARG (mode); ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (fname), ACE_SHLIB_HANDLE, 0); -# elif defined (__hpux) - return ::shl_load(fname, mode, 0L); # elif defined (ACE_VXWORKS) && !defined (__RTP__) ACE_UNUSED_ARG (mode); MODULE* handle = 0; @@ -206,21 +188,9 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, # else return ::dlsym (handle, symbolname); # endif /* ACE_USES_ASM_SYMBOL_IN_DLSYM */ - # elif defined (ACE_WIN32) - ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0); - -# elif defined (__hpux) - - void *value {}; - int status = 0; - shl_t _handle = handle; - ACE_OSCALL (::shl_findsym(&_handle, symbolname, TYPE_UNDEFINED, &value), int, status); - return status == 0 ? value : nullptr; - # elif defined (ACE_VXWORKS) && !defined (__RTP__) - // For now we use the VxWorks global symbol table // which resolves the most recently loaded symbols, which resolve // mostly what we want.. diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl index b00f6cdff78..24420947037 100644 --- a/ACE/ace/OS_NS_netdb.inl +++ b/ACE/ace/OS_NS_netdb.inl @@ -4,7 +4,7 @@ #include "ace/OS_NS_errno.h" #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) -# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && !defined (HPUX_11) +# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ do \ { \ @@ -22,7 +22,7 @@ return ace_result_; \ } \ } while(0) -# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0 && !HPUX_11) */ +# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0) */ # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ do \ { \ diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl index 94f0380ea43..f58a30520bc 100644 --- a/ACE/ace/OS_NS_string.inl +++ b/ACE/ace/OS_NS_string.inl @@ -403,8 +403,6 @@ ACE_OS::strstr (const wchar_t *s, const wchar_t *t) { # if defined (ACE_LACKS_WCSSTR) return ACE_OS::wcsstr_emulation (s, t); -# elif defined (HPUX) - return const_cast <const wchar_t *> (::wcswcs (s, t)); # else /* ACE_LACKS_WCSSTR */ return const_cast <const wchar_t *> (::wcsstr (s, t)); # endif /* ACE_LACKS_WCSSTR */ @@ -423,8 +421,6 @@ ACE_OS::strstr (wchar_t *s, const wchar_t *t) { # if defined (ACE_LACKS_WCSSTR) return ACE_OS::wcsstr_emulation (s, t); -# elif defined (HPUX) - return ::wcswcs (s, t); # else /* ACE_LACKS_WCSSTR */ return ::wcsstr (s, t); # endif /* ACE_LACKS_WCSSTR */ diff --git a/ACE/ace/OS_NS_stropts.inl b/ACE/ace/OS_NS_stropts.inl index 547a80cb3d5..203e090a19d 100644 --- a/ACE/ace/OS_NS_stropts.inl +++ b/ACE/ace/OS_NS_stropts.inl @@ -13,11 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_LACKS_CONST_STRBUF_PTR) -typedef struct strbuf *ACE_STRBUF_TYPE; -#else typedef const struct strbuf *ACE_STRBUF_TYPE; -#endif /* ACE_LACKS_CONST_STRBUF_PTR */ ACE_INLINE ACE_Str_Buf::ACE_Str_Buf (void *b, int l, int max) diff --git a/ACE/ace/OS_NS_sys_sendfile.cpp b/ACE/ace/OS_NS_sys_sendfile.cpp index a47fce717fd..6b744fd8ad1 100644 --- a/ACE/ace/OS_NS_sys_sendfile.cpp +++ b/ACE/ace/OS_NS_sys_sendfile.cpp @@ -1,9 +1,9 @@ #include "ace/OS_NS_sys_sendfile.h" #include "ace/OS_NS_sys_mman.h" -#if defined (ACE_WIN32) || defined (HPUX) +#if defined (ACE_WIN32) # include "ace/OS_NS_sys_socket.h" -#endif /* ACE_WIN32 || HPUX */ +#endif /* ACE_WIN32 */ #include "ace/OS_NS_unistd.h" @@ -50,7 +50,7 @@ ACE_OS::sendfile_emulation (ACE_HANDLE out_fd, else if (buf == MAP_FAILED) return -1; -#if defined (ACE_WIN32) || defined (HPUX) +#if defined (ACE_WIN32) ssize_t const r = ACE_OS::send (out_fd, static_cast<const char *> (buf), count); #else diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 4dfb181ecd0..2d618701ad4 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -403,12 +403,6 @@ ACE_OS::num_processors () return num_processors; else return -1; -#elif defined (__hpux) - struct pst_dynamic psd; - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - return psd.psd_max_proc_cnt; - else - return -1; #else ACE_NOTSUP_RETURN (-1); #endif @@ -457,12 +451,6 @@ ACE_OS::num_processors_online () return num_processors; else return -1; -#elif defined (__hpux) - struct pst_dynamic psd; - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - return psd.psd_proc_cnt; - else - return -1; #else ACE_NOTSUP_RETURN (-1); #endif diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h index 07b8ace2fa2..01795eb99d6 100644 --- a/ACE/ace/OS_TLI.h +++ b/ACE/ace/OS_TLI.h @@ -39,20 +39,8 @@ struct t_uderr { }; struct netbuf { }; # else /* !(ACE_HAS_TLI || ACE_HAS_XTI) */ - -# if defined (ACE_HAS_CONFLICTING_XTI_MACROS) - // Make sure tcp.h gets included before sys/xti.h. -# include "ace/os_include/netinet/os_tcp.h" -# undef TCP_NODELAY -# undef TCP_MAXSEG -# endif /* ACE_HAS_CONFLICTING_XTI_MACROS */ - # if defined (ACE_HAS_XTI) -# if defined (ACE_HAS_SYS_XTI_H) /* Nonstandard header placement */ -# define class ace_xti_class -# include /**/ <sys/xti.h> -# undef class -# elif defined (ACE_HAS_FORE_ATM_XTI) +# if defined (ACE_HAS_FORE_ATM_XTI) # include /**/ <fore_xti/xti_user_types.h> # include /**/ <fore_xti/xti.h> # include /**/ <fore_xti/xti_atm.h> diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 11308f32efd..00035c87937 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -75,15 +75,8 @@ ACE_POSIX_Proactor::ACE_POSIX_Proactor () os_id_ = ACE_OS_SUN_57; else if (ACE_OS::strcasecmp (Buf , "5.8") == 0) os_id_ = ACE_OS_SUN_58; - -#elif defined(HPUX) - - os_id_ = ACE_OS_HPUX; // set family - #elif defined(__OpenBSD) - os_id_ = ACE_OS_OPENBSD; // set family - // do the same //#else defined (LINUX, __FreeBSD__ ...) @@ -935,16 +928,12 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num () aiocb_list_max_size_ = max_os_aio_num; #endif -#if defined (HPUX) || defined (__FreeBSD__) - // Although HPUX 11.00 allows to start 2048 AIO's for all process in - // system it has a limit 256 max elements for aio_suspend () It is a - // pity, but ... - +#if defined (__FreeBSD__) long max_os_listio_num = ACE_OS::sysconf (_SC_AIO_LISTIO_MAX); if (max_os_listio_num > 0 && aiocb_list_max_size_ > (unsigned long) max_os_listio_num) aiocb_list_max_size_ = max_os_listio_num; -#endif /* HPUX || __FreeBSD__ */ +#endif /* __FreeBSD__ */ // check for user-defined value // ACE_AIO_MAX_SIZE if defined in POSIX_Proactor.h diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h index a16d6ff76f0..884ca481448 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -83,8 +83,6 @@ public: ACE_OS_SUN_56 = ACE_OS_SUN | 0x0002, ACE_OS_SUN_57 = ACE_OS_SUN | 0x0004, ACE_OS_SUN_58 = ACE_OS_SUN | 0x0008, - ACE_OS_HPUX = 0x0400, // HPUX family - ACE_OS_HPUX_11 = ACE_OS_HPUX | 0x0001, ACE_OS_LINUX = 0x0800, // Linux family ACE_OS_FREEBSD = 0x1000, // FreeBSD family ACE_OS_IRIX = 0x2000, // SGI IRIX family diff --git a/ACE/ace/README b/ACE/ace/README index af8df013528..5c67df99ebd 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -253,10 +253,6 @@ ACE_HAS_CLOCK_GETTIME_MONOTONIC Platform supports POSIX.1b clock_gettime () with the clock-id CLOCK_MONOTONIC ACE_HAS_CLOCK_SETTIME Platform supports POSIX.1b clock_settime () -ACE_HAS_CONFLICTING_XTI_MACROS OS's XTI header file defines some - TCP-related macros that netinet/tcp.h - also defines, but they conflict - (only seen on HP-UX 11). ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES Prototypes for both signal() and struct sigaction are consistent. @@ -271,7 +267,7 @@ ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT When a base-class is a then this class template must be explicitly exported ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION For the GCC compiler - on AIX, HPUX and VxWorks we have to + on AIX and VxWorks we have to explicitly instantiate static template members else we get multiple instances of the same static. @@ -744,9 +740,6 @@ ACE_LACKS_READDIR Platform lacks readdir and the readdir ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does *not* reset the time argument when the lock is acquired. -ACE_LACKS_CONST_STRBUF_PTR Platform uses struct strbuf * - rather than const struct - strbuf * (e.g., HP/UX 10.x) ACE_LACKS_CONST_TIMESPEC_PTR Platform forgot const in cond_timewait (e.g., HP/UX). ACE_LACKS_COND_T Platform lacks condition @@ -1087,13 +1080,6 @@ A returns. Note: if the allocated block is beyond the current stack limit, the resulting behavior is undefined. - In HPUX: - no equivalent. - - Notes: - in HPUX it has to do new and delete. Affects performance. - - ACE_HAS_AUTOMATIC_INIT_FINI: ---------------------------- @@ -1112,15 +1098,6 @@ ACE_HAS_AUTOMATIC_INIT_FINI: _init() and _fini() to be executed as is: dlsym ((char *) handle, "_fini"). - In HPUX: - don't set. - Maybe have to look into shl_load( ), shl_definesym( ), - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - Means Service Configurator won't be available. - TBA. - - ACE_HAS_HI_RES_TIMER: --------------------- @@ -1136,10 +1113,6 @@ ACE_HAS_HI_RES_TIMER: in the past; it is not correlated in any way to the time of day, and thus is not subject to resetting, drifting, etc. - In HPUX - look into: getclock(), reltimer(), getitimer() - maybe even vtimes structure vm_utime, vm_stime ? - Notes: TBA @@ -1150,9 +1123,6 @@ ACE_LACKS_T_ERRNO: Used In: ace/OS.h - HPUX: - set it. - Notes: if set, adds: extern int t_errno; @@ -1164,9 +1134,6 @@ ACE_HAS_POSIX_NONBLOCK: Used in: ace/OS.h - HPUX: - set it. - Notes: if defined, sets ACE_NONBLOCK and O_NONBLOCK O_NONBLOCK is used in libsrc/Misc/misc.C to do a @@ -1191,13 +1158,6 @@ ACE_HAS_PROC_FS: procfs.h defines things for the prpsinfo structure (basically to do a "ps" from inside a program). - HPUX: - don't set: obviously a different mechanism. - Look into /usr/include/sys/proc.h. The structure is proc. The - pointer to the kernel's proc table may be obtained by - extern struct proc *proc, *procNPROC; - extern int nproc; - ACE_HAS_PRUSAGE_T: ------------------ @@ -1212,10 +1172,6 @@ ACE_HAS_PRUSAGE_T: an interval. This stuff is highly non-portable. - HPUX: - don't set - - ACE_HAS_SEMUN: -------------- @@ -1230,14 +1186,6 @@ ACE_HAS_SEMUN: ushort *array; /* array for GETALL & SETALL */ }; - HPUX: - don't set. - in /usr/include/sem.h: - /* The fourth argument to semctl() varies depending on the value of - its first argument. If desired, "union semun" can be declared - by the user, but this is not necessary since the individual - member can just be passed as the argument. */ - ACE_HAS_SIG_ATOMIC_T: --------------------- @@ -1250,12 +1198,6 @@ ACE_HAS_SIG_ATOMIC_T: typedef int sig_atomic_t; This is used in the Reactor and service configurator. - HPUX: - set it. - in /usr/include/sys/signal.h: - typedef unsigned int sig_atomic_t; - - ACE_HAS_SSIZE_T: ---------------- @@ -1267,11 +1209,6 @@ ACE_HAS_SSIZE_T: typedef int ssize_t; used mostly in IPC_SAP. (don't confuse with size_t). - HPUX: - set it. - in /usr/include/sys/types.h - - ACE_HAS_STRBUF_T: ----------------- @@ -1294,10 +1231,6 @@ ACE_HAS_STRBUF_T: int putmsg(int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr, int flags); - HPUX: - don't set. - no SYS V.4 streams. - ACE_HAS_STREAMS: ---------------- @@ -1309,10 +1242,6 @@ ACE_HAS_STREAMS: Notes: if defined, includes <stropts.h> - HPUX: - don't set. - no SYS V.4 streams. - ACE_HAS_STREAM_PIPES: --------------------- @@ -1335,10 +1264,6 @@ ACE_HAS_STREAM_PIPES: if not set, won't be able to use the SPIPE class (IPC_SAP) with rendezvous handles. - HPUX: - don't set. - No sysV.4 streams. - ACE_HAS_SVR4_DYNAMIC_LINKING: ----------------------------- @@ -1351,12 +1276,6 @@ ACE_HAS_SVR4_DYNAMIC_LINKING: if defined, includes <dlfcn.h> with dlopen(), dlsym(), etc.. - HPUX: - don't set. - has its own: - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - ACE_HAS_SVR4_GETTIMEOFDAY: -------------------------- @@ -1371,16 +1290,6 @@ ACE_HAS_SVR4_GETTIMEOFDAY: Solaris: gettimeofday (struct timeval *tp) - HPUX: - don't set. - it has gettimeofday (struct timeval *tp, struct timezone *tzp); - most calls do a: - #if defined (ACE_HAS_SVR4_GETTIMEOFDAY) - ::gettimeofday (&cur_time); - #else - ::gettimeofday (&cur_time, 0); - #endif /* ACE_HAS_SVR4_GETTIMEOFDAY */ - ACE_HAS_POLL: ------------ @@ -1401,9 +1310,6 @@ ACE_USE_POLL_IMPLEMENTATION: Notes: Use the poll() event demultiplexor rather than select(). - HPUX: - set it. - ACE_HAS_SVR4_SIGNAL_T: ---------------------- @@ -1423,9 +1329,6 @@ ACE_HAS_SVR4_SIGNAL_T: typedef void (*SignalHandlerV)(...); #endif /* ACE_HAS_SVR4_SIGNAL_T */ - HPUX: - set it. - ACE_HAS_SVR4_TLI: ----------------- @@ -1439,10 +1342,6 @@ ACE_HAS_SVR4_TLI: TLI is the transport layer calls as in: t_bind(), t_open(), t_unbind(), t_optmgmt(), ... in SunOS and Solaris. - HPUX: - don't set. - Not supported. - ACE_HAS_SYS_FILIO_H: -------------------- @@ -1463,12 +1362,6 @@ ACE_HAS_SYS_FILIO_H: * in the future OS releases. */ - HPUX: - <sys/ioctl.h> defines FIOASYNC and some other ones, - <sgtty.h> defines some like FIOCLEX. - some are never defined. - use #ifdef HP-UX to modify sysincludes.h - ACE_HAS_TEMPLATE_TYPEDEFS: -------------------------- @@ -1511,9 +1404,6 @@ ACE_HAS_THREADS: We use Message_List.h even in a non-threaded environment. our XOMessageList.h does this by #ifdefs around Threaded things. - HPUX: - not until 10.0. - ACE_HAS_TIMOD_H: ---------------- @@ -1532,9 +1422,6 @@ ACE_HAS_TIMOD_H: vider that supports the Transport Interface. This allows a user to initiate certain TI functions as atomic operations. - HPUX: - don't set. - ACE_HAS_TIUSER_H: ----------------- @@ -1548,9 +1435,6 @@ ACE_HAS_TIUSER_H: Solaris: in conjunction with t_bind, t_accept, etc.. transport layer. - HPUX: - don't set. - ACE_USE_POLL_IMPLEMENTATION: ---------------------------- diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 32df890caa1..200b8ef9d11 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -49,18 +49,6 @@ const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTER # if defined (SIOCGLIFCONF) # define SIOCGIFCONF_CMD SIOCGLIFCONF -# if defined (__hpux) -# define IFREQ if_laddrreq -# define IFCONF if_laddrconf -# define IFC_REQ iflc_req -# define IFC_LEN iflc_len -# define IFC_BUF iflc_buf -# define IFR_ADDR iflr_addr -# define IFR_NAME iflr_name -# define IFR_FLAGS iflr_flags -# undef SETFAMILY -# define SA_FAMILY sa_family -# else # define IFREQ lifreq # define IFCONF lifconf # define IFC_REQ lifc_req @@ -73,7 +61,6 @@ const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTER # define IFC_FAMILY lifc_family # define IFC_FLAGS lifc_flags # define SA_FAMILY ss_family -# endif # else # define SIOCGIFCONF_CMD SIOCGIFCONF # define IFREQ ifreq @@ -738,177 +725,6 @@ get_ip_interfaces_getifaddrs (size_t &count, return 0; } -#elif defined (__hpux) -static int -get_ip_interfaces_hpux (size_t &count, - ACE_INET_Addr *&addrs) -{ - size_t num_ifs = 0; - size_t num_ifs_found = 0; - - // Call specific routine as necessary. - ACE_HANDLE handle = ACE_OS::socket (PF_INET, SOCK_DGRAM, 0); - ACE_HANDLE handle_ipv6 = ACE_INVALID_HANDLE; - - if (handle == ACE_INVALID_HANDLE) - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:open")), - -1); - - int result = 0; - int tmp_how_many = 0; - - result = ACE_OS::ioctl (handle, - SIOCGIFNUM, - (caddr_t) &tmp_how_many); - if (result != -1) - num_ifs = (size_t)tmp_how_many; - -# if defined (ACE_HAS_IPV6) - tmp_how_many = 0; - handle_ipv6 = ACE_OS::socket (PF_INET6, SOCK_DGRAM, 0); - result = ACE_OS::ioctl (handle_ipv6, - SIOCGLIFNUM, - (caddr_t) &tmp_how_many); - if (result != -1) - num_ifs += (size_t)tmp_how_many; -# endif - - if (num_ifs == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - return -1; - } - - // ioctl likes to have an extra IFREQ structure to mark the end of - // what it returned, so increase the num_ifs by one. - ++num_ifs; - - //HPUX requires two passes, First for IPv4, then for IPv6 - - struct ifreq *ifs = 0; - ACE_NEW_RETURN (ifs, - struct ifreq[num_ifs], - -1); - ACE_OS::memset (ifs, 0, num_ifs * sizeof (struct ifreq)); - - ACE_Auto_Array_Ptr<struct ifreq> p_ifs (ifs); - - if (p_ifs.get() == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - errno = ENOMEM; - return -1; - } - - struct ifconf ifcfg; - ACE_OS::memset (&ifcfg, 0, sizeof (struct ifconf)); - - ifcfg.ifc_req = p_ifs.get (); - ifcfg.ifc_len = num_ifs * sizeof (struct ifreq); - - if (ACE_OS::ioctl (handle, - SIOCGIFCONF, - (char *) &ifcfg) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:") - ACE_TEXT ("ioctl - SIOCGIFCONF failed")), - -1); - } - - ACE_OS::close (handle); - - // Now create and initialize output array. - - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[num_ifs], - -1); // caller must free - - struct ifreq *pcur = p_ifs.get (); - num_ifs_found = ifcfg.ifc_len / sizeof (struct ifreq); // get the number of returned ifs - - for (size_t i = 0; - i < num_ifs_found; - i++) - { - struct sockaddr_in *addr = - reinterpret_cast<sockaddr_in *> (&pcur->ifr_addr); - if (addr->sin_addr.s_addr != 0) - { - addrs[count].set ((u_short) 0, - addr->sin_addr.s_addr, - 0); - ++count; - } - ++pcur; - } - -# if defined (ACE_HAS_IPV6) - - if (handle_ipv6 != ACE_INVALID_HANDLE) - { - struct if_laddrreq *lifs = 0; - ACE_NEW_RETURN (lifs, - struct if_laddrreq[num_ifs], - -1); - ACE_OS::memset (lifs, 0, num_ifs * sizeof (struct if_laddrreq)); - - ACE_Auto_Array_Ptr<struct if_laddrreq> p_lifs (lifs); - - if (p_lifs.get() == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - errno = ENOMEM; - return -1; - } - - struct if_laddrconf lifcfg; - ACE_OS::memset (&lifcfg, 0, sizeof (struct if_laddrconf)); - - lifcfg.iflc_req = p_lifs.get (); - lifcfg.iflc_len = num_ifs * sizeof (struct if_laddrreq); - - if (ACE_OS::ioctl (handle_ipv6, - SIOCGLIFCONF, - (char *) &lifcfg) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:") - ACE_TEXT ("ioctl - SIOCGLIFCONF failed")), - -1); - } - - ACE_OS::close (handle_ipv6); - - struct if_laddrreq *plcur = p_lifs.get (); - num_ifs_found = lifcfg.iflc_len / sizeof (struct if_laddrreq); - - for (size_t i = 0; - i < num_ifs_found; - i++) - { - struct sockaddr_in *addr = - reinterpret_cast<sockaddr_in *> (&plcur->iflr_addr); - if (!IN6_IS_ADDR_UNSPECIFIED(&reinterpret_cast<sockaddr_in6 *>(addr)->sin6_addr)) - { - addrs[count].set(addr, sizeof(struct sockaddr_in6)); - ++count; - } - ++plcur; - } - } -# endif /* ACE_HAS_IPV6 */ - return 0; -} #elif defined (_AIX) static int get_ip_interfaces_aix (size_t &count, @@ -989,7 +805,7 @@ get_ip_interfaces_aix (size_t &count, return 0; } -#endif // ACE_WIN32 || ACE_HAS_GETIFADDRS || __hpux || _AIX +#endif // ACE_WIN32 || ACE_HAS_GETIFADDRS _AIX // return an array of all configured IP interfaces on this host, count @@ -1008,8 +824,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) return get_ip_interfaces_win32 (count, addrs); #elif defined (ACE_HAS_GETIFADDRS) return get_ip_interfaces_getifaddrs (count, addrs); -#elif defined (__hpux) - return get_ip_interfaces_hpux (count, addrs); #elif defined (_AIX) return get_ip_interfaces_aix (count, addrs); #elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING) @@ -1202,7 +1016,7 @@ int ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many) { #if defined (SIOCGIFNUM) -# if defined (SIOCGLIFNUM) && !defined (ACE_LACKS_STRUCT_LIFNUM) +# if defined (SIOCGLIFNUM) int cmd = SIOCGLIFNUM; struct lifnum if_num = {AF_UNSPEC,0,0}; # else @@ -1215,7 +1029,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many) ACE_TEXT ("ACE::count_interfaces:") ACE_TEXT ("ioctl - SIOCGLIFNUM failed")), -1); -# if defined (SIOCGLIFNUM) && !defined (ACE_LACKS_STRUCT_LIFNUM) +# if defined (SIOCGLIFNUM) how_many = if_num.lifn_count; # else how_many = if_num; @@ -1341,10 +1155,8 @@ ACE::get_handle () ACE_HANDLE handle = ACE_INVALID_HANDLE; #if defined (sparc) handle = ACE_OS::open ("/dev/udp", O_RDONLY); -#elif defined (__unix) || defined (__unix__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_HAS_RTEMS) - // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX, - // AIX, SunOS 4.x - +#elif defined (__unix) || defined (__unix__) || defined (_AIX) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_HAS_RTEMS) + // Note: DEC CXX doesn't define "unix" BSD compatible OS: AIX, SunOS 4.x handle = ACE_OS::socket (PF_INET, SOCK_DGRAM, 0); #endif /* sparc */ return handle; diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h deleted file mode 100644 index f3802570a64..00000000000 --- a/ACE/ace/config-hpux-11.00.h +++ /dev/null @@ -1,381 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for HP -// platforms running HP-UX 11.00 using aC++ or gcc (2.95 and up). - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_SYS_SELECT_H - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#else - -// aC++... - -// Precompiler needs extra flags to ignore "invalid #pragma directive" -# define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" - -// Platform lacks streambuf "linebuffered ()". -# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 - -// Compiler's template mechanism must see source code (i.e., .C files). -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h) -# define ACE_LACKS_SIGNED_CHAR - -#endif /* __GNUG__, HP */ - -//********************************************************************* -// -// From here down is the compiler-INdependent OS settings. -// -//********************************************************************* - -// Compiling for HPUX. -#if !defined (HPUX) -#define HPUX -#endif /* HPUX */ -#define HPUX_11 - -#ifndef _HPUX_SOURCE -#define _HPUX_SOURCE -#endif - -#include /**/ <sys/stdsyms.h> - -// HP-UX is a POSIX-compliant system - see what's available. -#include "ace/config-posix.h" - -// config-posix.h sets up ACE_HAS_AIO_CALLS if the headers define the -// proper things. In HP-UX 11's case, the AIOCB Proactor works the best -// overall. If the user hasn't overridden it, select AIOCB. -#if defined (ACE_HAS_AIO_CALLS) -# if !defined (ACE_POSIX_AIOCB_PROACTOR) && !defined (ACE_POSIX_SIG_PROACTOR) -# define ACE_POSIX_AIOCB_PROACTOR -# endif /* !ACE_HAS_POSIX_AIOCB_PROACTOR && !ACE_POSIX_SIG_PROACTOR */ -#endif /* ACE_HAS_AIO_CALLS */ - -//////////////////////////////////////////////////////////////////////////// -// General OS information - see README for more details on what they mean -// -/////////////////////////////////////////////////////////////////////////// - -// HP/UX needs to have these addresses in a special range. -// If this is on a 64-bit model, the default is to use 64-bit addressing. -// It can also be set so that the mapped region is shareable with 32-bit -// programs. To enable the 32/64 sharing, comment out the first definition -// of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it. -#if defined (__LP64__) -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -//# define ACE_OS_EXTRA_MMAP_FLAGS MAP_ADDR32 - -# define ACE_DEFAULT_BASE_ADDRL (0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDRL (0x80000000) -#else -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#endif /* __LP64__ */ - -// Preprocessor needs some help with data types -#if defined (__LP64__) -# define ACE_SIZEOF_LONG 8 -#else -# define ACE_SIZEOF_LONG 4 -#endif - -// Platform can do async I/O (aio_*) (set up in config-posix.h) -// ... but seems to require this in order to keep from hanging. Needs some -// investigation, maybe with HP. John Mulhern determined this value -// empirically. YMMV. If it does vary, set it up in your own config.h which -// then includes the ACE-supplied config. -#if !defined (ACE_INFINITE) -# define ACE_INFINITE 10000000 -#endif - -/* Compiler/platform correctly calls init()/fini() for shared libraries. */ -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 - -// Manually tweak the malloc control block paddings to properly align -// things. -#define ACE_MALLOC_PADDING 16 -#define ACE_MALLOC_ALIGN 8 -#define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 3 - -// Compiler/platform contains the <sys/syscall.h> file. -#define ACE_HAS_SYS_SYSCALL_H - -#define ACE_HAS_SYS_PSTAT_H - -// But doesn't have a prototype for syscall() -#define ACE_LACKS_SYSCALL - -// Platform supports POSIX.1b clock_gettime () -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME - -#define ACE_LACKS_CLOCK_MONOTONIC - -#define ACE_LACKS_PTHREAD_SCOPE_PROCESS - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has Dirent iterator functions. -#define ACE_HAS_DIRENT - -#define ACE_HAS_VSWPRINTF - -// Platform supports getpagesize() call -#define ACE_HAS_GETPAGESIZE -// But we define this just to be safe -#define ACE_PAGE_SIZE 4096 - -// Can run gperf on this platform (needed for TAO) -# define ACE_HAS_GPERF - -// Optimize ACE_Handle_Set for select(). -# define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST -// At least for 11iv2, lacks perfect filtering. -#if (HPUX_VERS >= 1123) && !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif - -/* Platform defines MAP_FAILED as a long constant. */ -#define ACE_HAS_LONG_MAP_FAILED 1 - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Platform's select() has non-const timeval argument -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports the POSIX struct timespec type -#define ACE_HAS_POSIX_TIME - -/* Platform has pread() and pwrite() support. */ -#define ACE_HAS_P_READ_WRITE 1 - -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 - -// Platform supports reentrant functions (all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS -// ctime_r and asctime_r conform to POSIX.1c (2 param version) -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -// Platform offers scandir(), and requires no adjustments for its API. -#define ACE_HAS_SCANDIR - -// HP-UX 11 has reentrant netdb functions. The catch is that the old -// functions (gethostbyname, etc.) are thread-safe and the _r versions are -// obsolescent. So, define things so the _r versions are not used. -// OS_NS_netdb.inl ensures no funny lock games are played in the -// ACE_NETDBCALL_RETURN macro. -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ -#define ACE_LACKS_PRI_T 1 - -// Platform has shm_open -#define ACE_HAS_SHM_OPEN - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -/* Compiler requires extern "C" functions for signals. */ -#define ACE_HAS_SIG_C_FUNC 1 - -// Platform's sigaction() function takes const sigaction* as 2nd parameter. -#define ACE_HAS_SIGACTION_CONSTP2 - -#define ACE_HAS_SSIZE_T - -// Platform supports SVR4 extended signals -#define ACE_HAS_SIGINFO_T - -/* Define to 1 if platform has sigsuspend(). */ -#define ACE_HAS_SIGSUSPEND 1 - -// Platform doesn't detect a signal out of range unless it's way out of range. -#define ACE_HAS_SIGISMEMBER_BUG - -/* Platform provides socklen_t type, such as Linux with glibc2. */ -#define ACE_HAS_SOCKLEN_T 1 - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -#define ACE_HAS_UALARM - -// Platform supports ucontext_t (which is used in the extended signal API). -#define ACE_HAS_UCONTEXT_T - -// Platform/compiler supports void * as second parameter to gettimeofday(). -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY - -/* Platform requires void * for mmap(). */ -#define ACE_HAS_VOIDPTR_MMAP 1 - -/* OS/compiler uses void * arg 4 setsockopt() rather than const char * */ -#define ACE_HAS_VOIDPTR_SOCKOPT 1 - -// Platform supports SVR4 dynamic linking semantics. -// When used, this requires -ldl on the ACE library link line. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform supports the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -/* Define to 1 if platform has the declaration of getrusage(). */ -#define ACE_HAS_GETRUSAGE_PROTOTYPE 1 - -// Platform has the sigwait function in a header file -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGTIMEDWAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// accept() is thread-safe -#define ACE_HAS_THREAD_SAFE_ACCEPT - -// Platform lacks a typedef for timespec_t, but has struct timespec -#define ACE_LACKS_TIMESPEC_T - -// dlopen() takes a char* instead of const char* -#define ACE_HAS_CHARPTR_DL - -// lacks setegid and seteuid -#define ACE_LACKS_SETEGID -#define ACE_LACKS_SETEUID - -#define ACE_LACKS_SUSECONDS_T -#define ACE_LACKS_SYS_SYSCTL_H - -#if !(defined(__STDC_EXT__) || defined(_INCLUDE_LONGLONG) || defined(_INCLUDE_STDC__SOURCE_199901)) -# define ACE_LACKS_STRTOLL -# define ACE_LACKS_WCSTOLL -# define ACE_LACKS_STRTOULL -# define ACE_LACKS_WCSTOULL -#endif - -#define ACE_LACKS_ISWASCII - -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV - -// Shared library name/path components -#if defined (__ia64) -# define ACE_DLL_SUFFIX ACE_TEXT (".so") -#else -# define ACE_DLL_SUFFIX ACE_TEXT (".sl") -#endif /* __ia64 */ -#if defined (__LP64__) -# define ACE_LD_SEARCH_PATH ACE_TEXT ("LD_LIBRARY_PATH") -#else -# define ACE_LD_SEARCH_PATH ACE_TEXT ("SHLIB_PATH") -#endif /* __LP64__ */ - -#if defined (_INCLUDE__STDC_A1_SOURCE) -# define ACE_HAS_3_PARAM_WCSTOK -#endif - -#define ACE_LACKS_STRUCT_LIFNUM - -////////////////////////////////////////////////////////////////////////// -// STREAMS information -// -////////////////////////////////////////////////////////////////////////// - -// Platform supports STREAMS -#define ACE_HAS_STREAMS -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T -// But the putmsg signature doesn't have it as const... -// Well, it really does, but it depends on preprocessor defines. -#define ACE_LACKS_CONST_STRBUF_PTR -/* Platform supports TLI timod STREAMS module */ -#define ACE_HAS_TIMOD_H 1 - -// Platform supports STREAM pipes -// This is possible, but not by default - need to rebuild the kernel to -// get them enabled - see pipe(2) and "STREAMS/UX for the HP 9000" -// #define ACE_HAS_STREAM_PIPES - -///////////////////////////////////////////////////////////////////////// -// TLI/XTI information -// -//////////////////////////////////////////////////////////////////////// - -// Platform supports XTI (includes TLI). -#define ACE_HAS_XTI -// HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the -// errmsg not being const... -#define ACE_HAS_BROKEN_T_ERROR -// The definitions of TCP_NODELAY and TCP_MAXSEG conflict between -// sys/xti.h and netinet/tcp.h. -#define ACE_HAS_CONFLICTING_XTI_MACROS -/* Platform provides <sys/xti.h> header */ -#define ACE_HAS_SYS_XTI_H 1 - -///////////////////////////////////////////////////////////////////////// -// Threads information. -// -// Use of threads is controlled by the 'threads' argument to make. See -// include/makeinclude/platform_hpux_aCC.GNU for details. If it's not set, -// the default is to enable it, since kernel threads are always available -// on HP-UX 11, as opposed to 10.x where it was optional software. -// -//////////////////////////////////////////////////////////////////////// - -#if defined (ACE_HAS_THREADS) -# if (ACE_HAS_THREADS == 0) -# undef ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS == 0 */ -#else -# define ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_THREADS) - -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif - -// HP-UX doesn't define _POSIX_THREADS since it doesn't implement all -// features (lacks thread priority inheritance and protection), so -// config-posix.h doesn't get this one... -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_UNIX98_EXT -# define ACE_HAS_PTHREAD_CONTINUE -# define ACE_HAS_PTHREAD_RESUME_NP -# define ACE_HAS_PTHREAD_SUSPEND -# define ACE_HAS_RECURSIVE_MUTEXES -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_LACKS_PTHREAD_ATTR_SETSTACK -# define ACE_LACKS_CONDATTR_SETCLOCK -#endif /* ACE_HAS_THREADS */ - -#define ACE_HAS_POSIX_SEM - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index e64efa29939..fcb4520300d 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -107,7 +107,7 @@ # endif /* ACE_HAS_PROCESS_SPAWN */ # if !defined (ACE_HAS_DYNAMIC_LINKING) -# if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || defined (ACE_WIN32) || defined (ACE_VXWORKS) || defined (__hpux) +# if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || defined (ACE_WIN32) || defined (ACE_VXWORKS) # define ACE_HAS_DYNAMIC_LINKING 1 # endif # endif /* ACE_HAS_DYNAMIC_LINKING */ @@ -254,7 +254,7 @@ #if !defined (ACE_UNUSED_ARG) # if defined (__GNUC__) || defined (__BORLANDC__) # define ACE_UNUSED_ARG(a) (void) (a) -# elif defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) +# elif defined (ghs) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) // Some compilers complain about "statement with no effect" with (a). // This eliminates the warnings, and no code is generated for the null // conditional statement. @note that may only be true if -O is enabled, diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index be467aa2b24..eeb640e76e8 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -30,12 +30,6 @@ # if defined (ACE_HAS_NET_IF_DL_H) # include /**/ <net/if_dl.h> # endif /* ACE_HAS_NET_IF_DL_H */ -# if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. - Thanks to Torsten Kopper <tkue_0931@fastmail.fm> for this patch.*/ -# undef IOR -# endif /* HPUX && IOR */ #endif /* !ACE_LACKS_NET_IF_H */ #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) diff --git a/ACE/ace/os_include/os_dlfcn.h b/ACE/ace/os_include/os_dlfcn.h index d13d5ca5ce7..76b75cc082d 100644 --- a/ACE/ace/os_include/os_dlfcn.h +++ b/ACE/ace/os_include/os_dlfcn.h @@ -26,10 +26,6 @@ # include /**/ <dlfcn.h> #endif /* !ACE_LACKS_DLFCN_H */ -#if defined (__hpux) -# include /**/ <dl.h> -#endif /* __hpux */ - #if defined (ACE_VXWORKS) && !defined (__RTP__) # include /**/ <loadLib.h> /* for module load */ # include /**/ <unldLib.h> /* for module unload */ @@ -66,15 +62,7 @@ extern "C" # if !defined (ACE_DEFAULT_SHLIB_MODE) # define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GLOBAL # endif -#elif defined (__hpux) - typedef shl_t ACE_SHLIB_HANDLE; -# if !defined (ACE_SHLIB_INVALID_HANDLE) -# define ACE_SHLIB_INVALID_HANDLE 0 -# endif /* ACE_SHLIB_INVALID_HANDLE */ -# if !defined (ACE_DEFAULT_SHLIB_MODE) -# define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED | DYNAMIC_PATH -# endif /* ACE_DEFAULT_SHLIB_MODE */ -#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING && !__hpux */ +#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING */ typedef void *ACE_SHLIB_HANDLE; # if !defined (ACE_SHLIB_INVALID_HANDLE) # define ACE_SHLIB_INVALID_HANDLE 0 diff --git a/ACE/ace/os_include/os_pthread.h b/ACE/ace/os_include/os_pthread.h index 50c483ba9d7..56f253a80d1 100644 --- a/ACE/ace/os_include/os_pthread.h +++ b/ACE/ace/os_include/os_pthread.h @@ -70,17 +70,7 @@ # if defined (_POSIX_PRIORITY_SCHEDULING) # define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) -# if defined (HPUX) - // HP-UX's other is the SCHED_HPUX class, which uses historical - // values that have reverse semantics from POSIX (low value is - // more important priority). To use these in pthreads calls, - // the values need to be converted. The other scheduling classes - // don't need this special treatment. -# define ACE_PROC_PRI_OTHER_MIN \ - (sched_get_priority_min(SCHED_OTHER)) -# else -# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) -# endif /* HPUX */ + define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) # else /* UNICOS is missing a sched_get_priority_min() implementation */ # define ACE_PROC_PRI_FIFO_MIN 0 # define ACE_PROC_PRI_RR_MIN 0 @@ -90,12 +80,7 @@ # if defined (_POSIX_PRIORITY_SCHEDULING) # define ACE_PROC_PRI_FIFO_MAX (sched_get_priority_max(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MAX (sched_get_priority_max(SCHED_RR)) -# if defined (HPUX) -# define ACE_PROC_PRI_OTHER_MAX \ - (sched_get_priority_max(SCHED_OTHER)) -# else -# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) -# endif /* HPUX */ + define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) # else # define ACE_PROC_PRI_FIFO_MAX 59 # define ACE_PROC_PRI_RR_MAX 59 diff --git a/ACE/ace/os_include/os_termios.h b/ACE/ace/os_include/os_termios.h index 59392d90214..d16476497ae 100644 --- a/ACE/ace/os_include/os_termios.h +++ b/ACE/ace/os_include/os_termios.h @@ -26,9 +26,5 @@ # include /**/ <termios.h> #endif /* !ACE_LACKS_TERMIOS_H */ -#if defined (HPUX) -# include /**/ <sys/modem.h> -#endif /* HPUX */ - #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_TERMIOS_H */ diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h index a6a12c845ef..4e89b129f75 100644 --- a/ACE/ace/os_include/os_time.h +++ b/ACE/ace/os_include/os_time.h @@ -25,11 +25,8 @@ // @todo should we include anything from signal.h? #include "ace/os_include/sys/os_types.h" -// To get the proper select() signature, this is required for HP-UX, and -// maybe other platforms that offer both int and fdset forms of select(). -// For HP-UX, sys/time.h must be included before time.h, or -// _XOPEN_SOURCE_EXTENDED must be defined. It's not nice to require -// the preprocessor macro, so we force our select() preference this way. +// To get the proper select() signature, this is required for maybe other platforms +// that offer both int and fdset forms of select(). #if !defined (ACE_LACKS_SYS_TIME_H) # include /**/ <sys/time.h> #endif /* !ACE_LACKS_SYS_TIME_H */ diff --git a/ACE/ace/os_include/sys/os_socket.h b/ACE/ace/os_include/sys/os_socket.h index 8c8ce66f9ab..2106b7d62f5 100644 --- a/ACE/ace/os_include/sys/os_socket.h +++ b/ACE/ace/os_include/sys/os_socket.h @@ -261,25 +261,8 @@ extern "C" #if !defined (ACE_SOCKET_LEN) #if defined (ACE_HAS_SOCKLEN_T) -# if defined (__hpux) - /* - ** HP-UX supplies the socklen_t type unless some feature set less than - ** _XOPEN_SOURCE_EXTENDED is specifically requested. However, it only - ** actually uses the socklen_t type in supplied socket functions if - ** _XOPEN_SOURCE_EXTENDED is specifically requested. So, for example, - ** the compile options ACE usually uses (includes -mt) cause _HPUX_SOURCE - ** to be set, which sets _INCLUDE_XOPEN_SOURCE_EXTENDED (causing socklen_t - ** to be defined) but _not_ _XOPEN_SOURCE_EXTENDED (causing socket functions - ** to use int, not socklen_t). React to this situation here... - */ -# if defined (_XOPEN_SOURCE_EXTENDED) typedef socklen_t ACE_SOCKET_LEN; -# else -typedef int ACE_SOCKET_LEN; -# endif /* _XOPEN_SOURCE_EXTENDED */ -# else -typedef socklen_t ACE_SOCKET_LEN; -# endif /* __hpux */ +# endif /* ACE_HAS_SOCKLEN_T */ #elif defined (ACE_HAS_SIZET_SOCKET_LEN) typedef size_t ACE_SOCKET_LEN; #else diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index 39c2c7a092c..dffe96895bd 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -55,7 +55,7 @@ typedef double ACE_timer_t; typedef off_t ACE_LOFF_T; #elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) typedef off_t ACE_LOFF_T; -#elif defined (AIX) || defined (HPUX) || defined (__QNX__) +#elif defined (AIX) || defined (__QNX__) typedef off64_t ACE_LOFF_T; #elif defined (__sun) typedef offset_t ACE_LOFF_T; diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h index 31bf570c21f..5c8d7a9eafd 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h @@ -152,24 +152,6 @@ #define DLL_CAPABLE #define DLL_DLOPEN -#elif defined(HPUX) - -#define FILE_UNIX -#undef FILE_STDIO -#define DAEMON_UNIX_MOBRULE -#define DAEMON_NEEDS_SEMAPHORE -#define NET_SOCKETS -#define FILE_UNIX_MMAP -#define FILE_MMAP_FLAGS MAP_PRIVATE -#undef BSD_SIGNALS -#undef BSD_RLIMIT -#undef NEED_CRYPT_H -#define AUTH_DBM -#define SEM_FLOCK -#define ZERO(ptr,len) memset(ptr,0,len) -#define DLL_CAPABLE -#define DLL_HPSHL - #else /* Windows NT */ #include <wtypes.h> diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm index 165a3149be2..fe0bfb74aff 100644 --- a/ACE/bin/PerlACE/Run_Test.pm +++ b/ACE/bin/PerlACE/Run_Test.pm @@ -251,29 +251,6 @@ sub add_lib_path { sub check_privilege_group { - if ($^O eq 'hpux') { - my($access) = 'RTSCHED'; - my($status) = 0; - my($getprivgrp) = '/bin/getprivgrp'; - - if (-x $getprivgrp) { - if (open(GPG, "$getprivgrp |")) { - while(<GPG>) { - if (index($_, $access) >= 0) { - $status = 1; - } - } - close(GPG); - } - } - - if (!$status) { - print STDERR - "WARNING: You must have $access privileges to run this test.\n", - " Run \"man 1m setprivgrp\" for more information.\n"; - exit(0); - } - } } # waits until it finds a matching regular expression in a file diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU index ac70c620b61..f3988c7db69 100644 --- a/ACE/include/makeinclude/platform_gcc_clang_common.GNU +++ b/ACE/include/makeinclude/platform_gcc_clang_common.GNU @@ -80,14 +80,10 @@ templates ?= automatic versioned_so ?= 1 with_ld ?= ifneq ($(versioned_so),0) - ifeq ($(with_ld),hpux) - SOFLAGS += -Wl,+h -Wl,$(SONAME) + ifeq ($(with_ld),aix) + # What to do here??? else - ifeq ($(with_ld),aix) - # What to do here??? - else - SOFLAGS += -Wl,-h -Wl,$(SONAME) - endif + SOFLAGS += -Wl,-h -Wl,$(SONAME) endif endif diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU deleted file mode 100644 index 5a6dbea96ff..00000000000 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ /dev/null @@ -1,213 +0,0 @@ -# -# This is for HP-UX 11.x using the aC++ compiler. -# -# HP-UX 11 supports both 32-bit and 64-bit builds, regardless of which -# architecture the build is done on. This file is set up to build native -# to the machine it's running on. To cross-build for another platform, add -# "buildbits=32" to make a 32-bit build, and "buildbits=64" to do a 64-bit -# build. Note that if you explicitly specify a 64-bit build, the option -# -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object -# file detected..." messages. - -buildbits ?= 0 -debug ?= 1 -distrib ?= 0 -optimize ?= 0 -stdcpplib ?= 1 -threads ?= 1 -versioned_so ?= 0 - -# First, extract the OS version number. -HPVERS_WORDS := $(subst ., ,$(shell uname -r)) -HPMODEL := $(shell uname -m) -HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) -# -CC = /bin/cc -CXX = aCC - -# Determine compiler version -CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1)) -CXXINFO := $(word 3, $(CXXVERS_WORDS)) -# aCC++ 3.67 gives "aCC: HP ANSI C++ B3910B A.03.67" -# aCC++ 3.73 gives "aCC: HP ANSI C++ B3910B A.03.73" -# -ifeq (ANSI, $(CXXINFO)) - CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) -else - ifeq (aC++/ANSI, $(CXXINFO)) - CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) - else - CXXMINORVERS := $(word 7, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 6, $(CXXVERS_WORDS)) - endif -endif - -# Want to be able to do [unsigned] long long. -CCFLAGS += -ext - -ifeq (1,$(stdcpplib)) - CCFLAGS += -AA - ifeq (03,$(CXXMAJORVERS)) - # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP - # as support call 3201224717. (Steve Huston, 23-Nov-2002) - CCFLAGS += +W930 - endif -# Compile errors using -AA and +noeh together - HP problem report -# JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001. -else - CCFLAGS += -AP -endif - -# Set the appropriate preprocessor defs for threading based on OS version -# and specified compiler options. -ifeq ($(threads),1) - THR_DEFS = -DACE_HAS_THREADS - CC_THR_DEFS += -mt -else - THR_DEFS = -DACE_HAS_THREADS=0 - # On HP-UX 11, even without building for threads, the *_r reentrant - # functions are available, and _REENTRANT enables them. - THR_DEFS += -D_REENTRANT -endif - -ifeq ($(HPMODEL), ia64) - itanium = 1 -endif - -ifeq (03,$(CXXMAJORVERS)) - # Suppress Warning 302 ((...) parameter list is a non-portable feature) - # Suppress Warning 361 (missing return from non-void function) - # Suppress Warning 1039(Binary incompatabilty between old and new compilers) - CCFLAGS += +W302,361,1039 - ifeq (57,$(CXXMINORVERS)) - # aCC 3.57 has a bug. When a class has private constructors - # and is trying to be created from a friend class we end up with - # a compile error. We disable array optimization in the compiler - # by setting this environment variable. HP CR JAGaf43094 - export aCC_ARRAY_OPT=OFF - endif - ifeq (60,$(CXXMINORVERS)) - # Same bug as above - export aCC_ARRAY_OPT=OFF - endif - ifeq (80,$(CXXMINORVERS)) - # Enabled template meta programming - CCFLAGS += +hpxstd98 - endif - ifeq (85,$(CXXMINORVERS)) - # Enabled template meta programming - CCFLAGS += +hpxstd98 - endif -endif - -ifeq (05,$(CXXMAJORVERS)) - # Warnings about binary incompatiblity - CCFLAGS += +W1016,1031 -endif - -ifeq (06,$(CXXMAJORVERS)) - ifeq (13,$(CXXMINORVERS)) - # Warnings dllexport/dllimport conflict with "x" (declared at line y); dllexport assumed - CCFLAGS += +W3390,3397 - endif -endif - -CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE -CCFLAGS += $(CC_THR_DEFS) - -DCCFLAGS += -g -DLD = $(CXX) $(CCFLAGS) -LD = $(CXX) -OCCFLAGS = -O -PIC = +Z - -AR = /usr/ccs/bin/ar -ARFLAGS = ruv -RANLIB = echo -LDFLAGS = -Wl,+s -z -SOFLAGS += -b - -ifeq ($(distrib),1) - -ifeq ($(buildbits),32) -SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib -endif -ifeq ($(buildbits),64) - ifeq ($(itanium),1) - SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/hpux64 - else - SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 - endif -endif - -endif - -ifeq ($(itanium),1) - SOEXT = so -else - SOEXT = sl -endif - -ifeq ($(buildbits),32) - ifeq ($(itanium),1) - CFLAGS += +DD32 - CCFLAGS += +DD32 - else - CFLAGS += +DA1.1 +DS1.1 - CCFLAGS += +DA1.1 +DS1.1 - endif -else -ifeq ($(buildbits),64) - ifeq ($(itanium),1) - CFLAGS += +DD64 - CCFLAGS += +DD64 - else - ## Without the W, it isn't really a 64-bit build - CFLAGS += +DA2.0W +DS2.0W - CCFLAGS += +DA2.0W +DS2.0W - endif -LDFLAGS += -Wl,+vnocompatwarnings -else - ifneq ($(itanium),1) - # HP aCC on Itanium doesn't support this option, defaults to 32bit then. - CFLAGS += +DAportable - CCFLAGS += +DAportable - endif -endif -endif - -#11.x: -ifeq ($(threads),1) - # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it. - ifeq ($(findstring -mt,$(CCFLAGS)),) - ## -L./ must directly preceed the system libraries for 64-bit builds - ## with aCC 3.27. Without this change, libpthread.sl can not be found. - LIBS += -L./ -lpthread - endif -endif -LIBS += -lxti -lrt -ldld - -# The correct flags to pass to the linker for dynamic shared library -# versioning -# -ifneq ($(SONAME),) - SOFLAGS += -Wl,+h -Wl,$(SONAME) -endif - -# if _FILE_OFFSET_BITS==64 then the HP headers will produce -# spurious 600 warnings, except on 11.23 -# Can also (possible) be fixed with patch PHKL_34670 on HP-UX 11.11 -# -ifeq ($(64bitoffsets),1) - ifneq ($(HPUX_VERS), 1123) - CCFLAGS += +W600 - endif -endif - -ifeq ($(c++11),1) - CCFLAGS += -Ax -endif - -LD_RPATH = -Wl,+s,+b, diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU deleted file mode 100644 index f6b754aa32a..00000000000 --- a/ACE/include/makeinclude/platform_hpux_gcc.GNU +++ /dev/null @@ -1,105 +0,0 @@ -# - -buildbits ?= 64 -debug ?= 1 -distrib ?= 0 -optimize ?= 1 -stdcpplib ?= 1 -threads ?= 1 -versioned_so ?= 0 -with_ld ?= hpux - -# First, extract the OS version number. -HPVERS_WORDS := $(subst ., ,$(shell uname -r)) -HPMODEL := $(shell uname -m) -HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) -# -CC = gcc -CXX = g++ -CFLAGS += -w - -# -# Set the appropriate preprocessor defs for threading based on OS version. -# If the user has requested building without threads, then don't set any. -# -ifeq ($(threads),1) - ifeq (3.,$(findstring 3.,$(CXX_VERSION))) - THR_DEFS = -threads - endif - ifeq ($(word 2,$(HPVERS_WORDS)), 11) - THR_DEFS += -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L - else - THR_DEFS += -DACE_HAS_THREADS -D_REENTRANT - endif -endif - -ifeq ($(HPMODEL), ia64) - itanium = 1 -endif - -# On HP-UX 11, there's a conflict with pthread_atfork in sys/unistd.h and -# sys/pthread.h - both define the function, but slightly differently. -# -fstrict-prototype resolves the issue. -#ifeq ($(word 2,$(HPVERS_WORDS)), 11) -#CCFLAGS += -fstrict-prototype -#endif -DCFLAGS += -g -DCCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -OCFLAGS += -O2 -PIC = -fPIC -# GNU ar doesn't work (missing libfl.sl?) so use HP ar. -AR = /usr/bin/ar -ARFLAGS = ruv -RANLIB = echo -LDFLAGS = -L. -L$(ACE_ROOT)/lib -Wl,+s -SOFLAGS += $(CPPFLAGS) -shared -nostdlib $(PIC) -Wl,-E -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $< -PRELIB = @true - -ifeq ($(itanium),1) - SOEXT = so -else - SOEXT = sl -endif - -ifeq ($(itanium),1) - ifeq ($(buildbits),64) - CCFLAGS += -mlp64 - CFLAGS += -mlp64 - else - CCFLAGS += -milp32 - CFLAGS += -milp32 - endif -endif - -# -# Grab the appropriate libraries based on the version of HP-UX we're building -# on and whether or not thread support is being used. -# -ifeq ($(word 2,$(HPVERS_WORDS)), 11) - - #11.x: - ifeq ($(threads),1) - LIBS += -lxti -lpthread -lrt -ldld - else - LIBS += -lxti -lrt -ldld - endif - -else - - # 10.x: - LIBS += -lxti -ldld - ifeq ($(threads),1) - LIBS += -lcma - endif - -endif - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += -DHPUX_VERS=$(HPUX_VERS) $(THR_DEFS) diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp index 960816e3402..5338c38ddc0 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.cpp +++ b/ACE/tests/Cached_Accept_Conn_Test.cpp @@ -34,8 +34,6 @@ // happy, it was necessary to have the definitions of the methods of // the Accept_Strategy before the instantiations. -// HPUX doesn't accept these declaration after their usage. - // For some strange reason this must *not* be static since otherwise // certain versions of SunC++ will not link properly. int connection_accepted = 0; diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp index c5f665a4fdc..f7aa9eb2ca7 100644 --- a/ACE/tests/FIFO_Test.cpp +++ b/ACE/tests/FIFO_Test.cpp @@ -106,9 +106,9 @@ server (void *arg) // On AIX, select() always seems to select a fifo handle as a normal file, // always readable. Just wait a second... -# if defined (AIX) || defined (HPUX) || defined (__osf__) +# if defined (AIX) defined (__osf__) ACE_OS::sleep (1); -# endif /* AIX || HPUX */ +# endif /* AIX */ // Read the things the client is sending; alphabet, huge overflow, then // alphabet. diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 273dbcadf48..c3d61cadabb 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -36,8 +36,7 @@ #include "ace/Thread_Manager.h" #if defined (ACE_AS_STATIC_LIBS) || \ - (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING) && \ - !defined (__hpux)) + (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING)) #include "ace/Logging_Strategy.h" #endif @@ -430,9 +429,7 @@ int run_main (int argc, ACE_TCHAR *argv []) // though, and you may activate the logging strategy as described in // the non-DLL section below under DLL environments as well. -#if !defined (ACE_AS_STATIC_LIBS) && \ - (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \ - defined (__hpux)) +#if !defined (ACE_AS_STATIC_LIBS) && (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING)) // Platform support DLLs, and not configured to link statically ACE_TCHAR arg_str[250]; @@ -467,8 +464,7 @@ int run_main (int argc, ACE_TCHAR *argv []) ((LM_ERROR, "Error initializing the ACE_Logging_Strategy.\n"), 1); -#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 || - ACE_HAS_SVR4_DYNAMIC_LINKING || __hpux) */ +#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 ACE_HAS_SVR4_DYNAMIC_LINKING) */ // launch a new Thread if (ACE_Thread_Manager::instance ()->spawn diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index bbbf4c6a61d..c93ea9b304e 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -70,7 +70,7 @@ static const void *PARENT_BASE_ADDR = ACE_DEFAULT_BASE_ADDR; // processes. So, though the whole PI pointer thing is tested here, // it isn't actually using multiple address ranges. -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX)) +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) # define CHILD_ADDR_DELTA (1024*1024) #else # define CHILD_ADDR_DELTA 0 diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index e48b46a43de..b9fad773749 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -603,8 +603,6 @@ snprintf_test (SNPrintF_t fn) ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE); retval = fn (buf, BUFFER_SIZE, "%d", 1234); - // HP-UX has broken vsnprintf -#if !defined (HPUX) if (retval != 4) { ACE_ERROR ((LM_ERROR, @@ -612,7 +610,6 @@ snprintf_test (SNPrintF_t fn) retval)); ++error_count; } -#endif /* !HPUX */ if (buf[3] != 0) { diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp index 8b29d634394..d8df9490bac 100644 --- a/ACE/tests/Process_Strategy_Test.cpp +++ b/ACE/tests/Process_Strategy_Test.cpp @@ -48,11 +48,6 @@ // Counting_Service and Options in here #include "Process_Strategy_Test.h" -// This test does not function properly when fork() is used on HP-UX -#if defined(__hpux) -#define ACE_LACKS_FORK -#endif /* __hpux */ - ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex); // Define a <Strategy_Acceptor> that's parameterized by the @@ -361,13 +356,6 @@ Counting_Service::handle_input (ACE_HANDLE) { char buf[BUFSIZ]; ACE_Time_Value* timeout = 0; -#if defined (__hpux) - // Even though we're in handle_input, there seems to be a - // situation on HP-UX where there is nothing to recv just yet. - // So, we recv() with a timeout and everything works. - ACE_Time_Value hpux_timeout (3); - timeout = &hpux_timeout; -#endif /* __hpux */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reading from peer on %d\n"), diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp index ed0e775b8ac..42270fa0b6d 100644 --- a/ACE/tests/Unload_libACE.cpp +++ b/ACE/tests/Unload_libACE.cpp @@ -26,9 +26,9 @@ #endif /* !ACE_VXWORKS && !__MINGW32__ && !CYGWIN32 */ #endif /* __GNUC__ */ -#if defined (__hpux) || defined (__SUNPRO_CC) +#if defined (__SUNPRO_CC) #define UNLOAD_LIBACE_TEST 1 -#endif /* (__hpux) || (__SUNPRO_CC) */ +#endif /* (__SUNPRO_CC) */ #if defined (ACE_AS_STATIC_LIBS) #undef UNLOAD_LIBACE_TEST @@ -160,9 +160,7 @@ main (int, char **) #else strcat (buf, "ACE"); #endif /* ACE_LIB_NAME */ -#if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1)) - strcat (buf, ".sl"); -#elif defined (__APPLE__) +#if defined (__APPLE__) strcat (buf, ".dylib"); #else strcat (buf, ".so"); diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index 9434fe85608..c8b018e3eb6 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -194,7 +194,7 @@ Proactor_UDP_Test: !VxWorks !LynxOS !nsk !ACE_FOR_TAO !BAD_AIO Process_Env_Test: !VxWorks !PHARLAP Process_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Manager_Test: !VxWorks !ACE_FOR_TAO !PHARLAP -Process_Manual_Event_Test: !HPUX !VxWorks !ACE_FOR_TAO !PHARLAP +Process_Manual_Event_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Semaphore_Test: !VxWorks !ACE_FOR_TAO !PHARLAP RB_Tree_Test diff --git a/TAO/TAO_IDL/docs/historical/README b/TAO/TAO_IDL/docs/historical/README index 700c1c1a707..22c2e50cdd7 100644 --- a/TAO/TAO_IDL/docs/historical/README +++ b/TAO/TAO_IDL/docs/historical/README @@ -148,7 +148,7 @@ platforms. The source distribution expects the following environment: - SunPro SparcWorks 3.x or 4.0 As preconfigured, it compiles on Solaris 2.x. It can be reconfigured to -compile on SunOS 4.x, HPUX or Apollo Domain OS. As far as is known, no use +compile on SunOS 4.x, Apollo Domain OS. As far as is known, no use is made of Sun Make-specific features, and the Makefiles should be usable with other make programs. diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index c12076ec35c..eaa53ba1a27 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -149,7 +149,7 @@ ACE_CC_PREPROCESSOR_ARGS macros.</P> <P>Case 1 is used by the Makefile on most machines to specify the preprocessor. Case 2 is used on Windows and platforms that need special arguments passed -to the preprocessor (MVS, HPUX, etc.). And case 3 isn't used at all, +to the preprocessor (MVS, etc.). And case 3 isn't used at all, but is included as a default case.</P> <P>Since the default preprocessor may not always work when TAO_IDL is moved to diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index 2ffb6c48a35..d8e9ae08ecd 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -27,13 +27,8 @@ Time_Client_i::run (const char *name, try { // 64-bit OS's require pointers to be aligned on an - // 8 byte boundary. 64-bit HP-UX requires a double to do this - // while a long does it for 64-bit Solaris. -#if defined (HPUX) - CORBA::Double padding = 0.0; -#else + // 8 byte boundary. CORBA::Long padding = 0; -#endif /* HPUX */ time_t timedate; ACE_UNUSED_ARG (padding); diff --git a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl index cf6a58430cf..f264f8cd1d2 100755 --- a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl @@ -20,8 +20,6 @@ my $ns = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $flt = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; -PerlACE::check_privilege_group(); - $nsiorfile = "naming.ior"; $nfsiorfile = "notify.ior"; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl index 85cb5a8d1f2..1fbdf0eefd2 100755 --- a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl @@ -22,8 +22,6 @@ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; my $con2 = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n"; -PerlACE::check_privilege_group(); - # Lanes Example # diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl index 7e04939283e..499b6f1efb2 100755 --- a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl @@ -20,8 +20,6 @@ my $ns = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $sub = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl index f88a7aab724..65e370099e1 100755 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl @@ -22,8 +22,6 @@ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; my $con2 = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n"; -PerlACE::check_privilege_group(); - # ThreadPool Example # diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index a0cebd7da5a..87c6e2d03f2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -196,28 +196,9 @@ TAO_LB_CPU_Load_Average_Monitor::loads () } else throw CORBA::TRANSIENT (); // Correct exception? - -#elif defined (__hpux) - - struct pst_dynamic psd; - - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - { - const long & num_processors = psd.psd_proc_cnt; - - ACE_ASSERT (num_processors > 0); - - if (num_processors > 0) - load = psd.psd_avg_1_min / num_processors; - else - throw CORBA::TRANSIENT (); // Correct exception? - } - else - throw CORBA::TRANSIENT (); // Correct exception? - #endif -#if defined (ACE_LINUX) || defined (sun) || defined (__hpux) || defined(__NetBSD__) || defined (__APPLE__) +#if defined (ACE_LINUX) || defined (sun) || defined(__NetBSD__) || defined (__APPLE__) CosLoadBalancing::LoadList * tmp = 0; ACE_NEW_THROW_EX (tmp, CosLoadBalancing::LoadList (1), diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index c1d0f295880..d7ddddee467 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -716,11 +716,6 @@ ACE_Scheduler_Factory::log_scheduling_tuples( ACE_OS::fclose (file); } -#if defined (HPUX) && !defined (__GNUG__) - // aCC can't handle RtecScheduler::Preemption_Priority_t used as an operator - // name. - typedef CORBA::Long RtecScheduler_Preemption_Priority_t; -#endif /* HPUX && !g++ */ RtecScheduler::Preemption_Priority_t ACE_Scheduler_Factory::preemption_priority () @@ -731,15 +726,8 @@ ACE_Scheduler_Factory::preemption_priority () { ACE_TSS_Type_Adapter<RtecScheduler::Preemption_Priority_t> *tss = ace_scheduler_factory_data->preemption_priority_; - // egcs 1.0.1 raises an internal compiler error if we implicitly - // call the type conversion operator. So, call it explicitly. -#if defined (HPUX) && !defined (__GNUG__) - const RtecScheduler::Preemption_Priority_t preemption_priority = - static_cast<RtecScheduler::Preemption_Priority_t> (tss->operator RtecScheduler_Preemption_Priority_t ()); -#else const RtecScheduler::Preemption_Priority_t preemption_priority = static_cast<RtecScheduler::Preemption_Priority_t> (tss->operator RtecScheduler::Preemption_Priority_t ()); -#endif /* HPUX && !g++ */ return preemption_priority; } else @@ -760,12 +748,7 @@ ACE_Scheduler_Factory::set_preemption_priority return; ace_scheduler_factory_data->preemption_priority_-> -#if defined (HPUX) && !defined (__GNUG__) - // aCC can't handle the typedef. - operator RtecScheduler_Preemption_Priority_t & () = preemption_priority; -#else operator RtecScheduler::Preemption_Priority_t & () = preemption_priority; -#endif /* HPUX && !g++ */ } diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index a6e3b6a798c..b24fd7d9b5f 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -256,13 +256,6 @@ static const short ace_cc_yycheck[] = { 4, #pragma alloca #define ACE_CC_YYSTACK_USE_ALLOCA #else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define ACE_CC_YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ #endif /* not sparc */ diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index fb38960eccc..4171598ddae 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -22,8 +22,6 @@ my $test = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed $test->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl index 1f699934ef0..d8abc1dad28 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl @@ -22,8 +22,6 @@ my $test = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed $test->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index 1e3905e547c..65a6f4e22fa 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl index 78f6114cfeb..7aebe8adb25 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl index 91ae2a85513..4680033d4e9 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $domain1 = "domain1"; $domain2 = "domain2"; $expect_pass = "0"; diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl index 46929f02acf..793ae6427e5 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl @@ -26,8 +26,6 @@ $sup->AddLibPath ('../lib'); $con1->AddLibPath ('../lib'); $con2->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index 72ee2ef01ec..94b32ace888 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -28,8 +28,6 @@ $stc->AddLibPath ('../lib'); $ses->AddLibPath ('../lib'); $sec->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); $deadline = 0; diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl index 08fb3d48377..4d89c2ea9c4 100755 --- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl @@ -7,8 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - $status = 0; $debug_level = '0'; diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl index 2c39fbdd1d8..0c94da066bd 100755 --- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl @@ -26,8 +26,6 @@ $mon->AddLibPath ('../lib'); $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - # define the following as necessary to customize the test my $static_build = 0; my $port = $ns->RandomPort (); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index c5bbbcf2552..4132769ee50 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; $shutdown_timeout = 10; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index b26025b89d4..fbe92157694 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -28,8 +28,6 @@ $stc->AddLibPath ('../lib'); $ses->AddLibPath ('../lib'); $sec->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $deadline = 0; $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h index 110c1cbf2c6..a5457acb7d2 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h @@ -50,10 +50,6 @@ protected: /// Create the POA with the params parsed. void create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa); -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl index 8c557aa1972..efb64a5eacf 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl index d9b2fbadf98..fdc1cd84a40 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index 3b6d2c1b6c7..556c71e84de 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl index 7002b6aaf44..15b32fb30aa 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index c6282c68e8b..0b38411716b 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -21,8 +21,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - $experiment_timeout = 120; $startup_timeout = 120; $nfsconffile = "notify.conf"; diff --git a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl index 0795c8cce42..1c95fc0d989 100755 --- a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl @@ -25,8 +25,6 @@ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); $ns->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - #my $nscorbaloc = "-ORBInitRef NameService=file://$namingior"; my $supiorfile = "supplier.ior"; diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h index 1f7ecaefee3..527e2bc4844 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -45,10 +45,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { INIT, diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h index 4cc0689e70c..8d49ec845be 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h @@ -25,10 +25,6 @@ class TAO_Notify_Tests_Command; * * @brief Template class to create COMMAND specific factories. */ -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif template <class COMMAND> class TAO_Notify_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Factory, public ACE_Service_Object { diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index 7b9a8b7cf82..581379612e4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -45,10 +45,6 @@ public: protected: /// = Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index aa45aef7489..9900fe4772a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -49,10 +49,6 @@ public: protected: ///= Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index f679a6682b4..66bd77adb5d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -44,10 +44,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE_FACTORY, diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index 12778f61a6e..cac534dd344 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -47,10 +47,6 @@ public: protected: ///= Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index e0d01d2559d..557188fd4d1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -46,10 +46,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index e7b13a30048..f95c319339c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -44,10 +44,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl index 3c4198790f7..cf925af1e25 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -7,8 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - my $nm_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $nt_service = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $consumer = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl index 9411ec61050..0567a2f11c2 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl @@ -6,8 +6,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - $status = 0; @test_configs = ( "reactive.conf", "lookup.conf", "listener.conf"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl index a20b3706fb3..546265378a4 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl index 0a4f35bb22c..45c3137daeb 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl index f58e0e09cc9..06f7066d653 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h:debug"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl index 93777990d13..92fd042da40 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h:debug"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl index f9b2b14509b..8563834b89c 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl @@ -9,8 +9,6 @@ use PerlACE::TestTarget; use File::Copy; use Getopt::Std; -PerlACE::check_privilege_group(); - $status = 0; $debug_level = '0'; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl index 889e1dfba12..275ed49867e 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl @@ -9,10 +9,6 @@ use PerlACE::TestTarget; use File::Copy; use Getopt::Std; -PerlACE::check_privilege_group(); - -$status = 0; - # -n notify.conf -s high_path.conf -c other_paths.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h index 3f116926ccd..22d87a757b6 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h @@ -49,8 +49,6 @@ if (status != OK)\ #elif defined (ACE_WIN32) || defined (__FreeBSD__) #define SCHED_PRIORITY \ ACE_Sched_Params::priority_max(ACE_SCHED_FIFO,ACE_SCOPE_THREAD) -#elif defined (HPUX) -#define SCHED_PRIORITY ACE_THR_PRI_FIFO_MAX #else #define SCHED_PRIORITY \ ACE_THR_PRI_FIFO_DEF + 25 diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index f8d3762ed62..be3a1b18ef3 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -32,12 +32,6 @@ #include "tao/Any_Insert_Policy_T.h" #include <atomic> -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Stub; diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 75199865edb..153a3d8207d 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -24,12 +24,6 @@ #include "tao/ORB_Core_Auto_Ptr.h" #include <atomic> -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations. diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index 398ef5c1064..cc2b43ce9bd 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -27,12 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace IOP diff --git a/TAO/tests/HandleExhaustion/run_test.pl b/TAO/tests/HandleExhaustion/run_test.pl index e3f912ce729..0e1a57f234c 100755 --- a/TAO/tests/HandleExhaustion/run_test.pl +++ b/TAO/tests/HandleExhaustion/run_test.pl @@ -8,8 +8,8 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; use strict; -if ($^O eq 'hpux' || $^O eq 'lynxos') { - print "This test will not run properly on HP-UX or LynxOS.\n", +if ($^O eq 'lynxos') { + print "This test will not run properly on LynxOS.\n", "When one process uses up all of the file descriptors, no other\n", "processes run by the same user can start.\n"; exit(0); diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp index 21aa3e07330..28aa6b3797d 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp @@ -24,7 +24,7 @@ Test_i::sleep (CORBA::Long sec, CORBA::Long msec) unsleep_ = false; ACE_Time_Value duration (sec); - duration.msec (static_cast<long> (msec)); // HPUX seems to require this cast + duration.msec (static_cast<long> (msec)); if (sec == 0 && msec == 0) { // 1000 seconds is infinity diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.hpux b/TAO/tests/RTCORBA/Banded_Connections/bands.hpux deleted file mode 100644 index f4b469e61f4..00000000000 --- a/TAO/tests/RTCORBA/Banded_Connections/bands.hpux +++ /dev/null @@ -1 +0,0 @@ -16 20 21 27 28 31 diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl index b7e699a64f4..36fb1648c9f 100755 --- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl +++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl @@ -53,10 +53,6 @@ if ($^O eq "MSWin32") { $server_args = "-b bands.nt"; } -elsif ($^O eq "hpux") { - $server_args = - "-b bands.hpux"; -} else { $server_args = "-b bands.unix"; diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl b/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl index dc8133995ef..592dc6439f5 100755 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl @@ -12,7 +12,6 @@ my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 fail $number_of_clients = 4; $status = 0; -$continuous = ($^O eq 'hpux'); @configurations = ({ @@ -57,10 +56,6 @@ sub run_clients $SV = $server->CreateProcess ("server"); -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf b/TAO/tests/RTCORBA/Collocation/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Collocation/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Collocation/run_test.pl b/TAO/tests/RTCORBA/Collocation/run_test.pl index 933821b6635..742c93117d6 100755 --- a/TAO/tests/RTCORBA/Collocation/run_test.pl +++ b/TAO/tests/RTCORBA/Collocation/run_test.pl @@ -7,18 +7,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -$continuous = ($^O eq 'hpux'); - print STDERR "\n********** RTCORBA Collocation Unit Test **********\n\n"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; $T = $server->CreateProcess ("Collocation"); -if ($continuous) { - $T->Arguments("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $test = $T->SpawnWaitKill($server->ProcessStartWaitInterval ()); if ($test == 2) { # Mark as no longer running to avoid errors on exit. diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl index c5178cd358d..0dd08953484 100755 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl @@ -9,14 +9,9 @@ use PerlACE::TestTarget; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -$continuous = ($^O eq 'hpux'); - print STDERR "\n********** RTCORBA Destroy_Thread_Pool Unit Test **********\n\n"; $SV = $server->CreateProcess ("Destroy_Thread_Pool"); -if ($continuous) { - $SV->Arguments("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} $server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf deleted file mode 100644 index 43526314bed..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000" diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml deleted file mode 100644 index bbb864e64b0..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl index ad7ed09335e..11188a49f9d 100755 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl @@ -9,7 +9,6 @@ use PerlACE::TestTarget; $number_of_clients = 1; $status = 0; -$continuous = ($^O eq 'hpux'); my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; @@ -48,11 +47,6 @@ sub run_clients } $SV = $server->CreateProcess ("server"); - -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl index aafa46c19bf..3473e447733 100755 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl @@ -37,10 +37,6 @@ if ($^O eq "MSWin32") { $priority1 = 2; $priority2 = 1; } -elsif ($^O eq "hpux") { - $priority1 = 17; - $priority2 = 22; -} else { $priority1 = 45; $priority2 = 50; diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl index af31dd971e8..f1dbb327896 100755 --- a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl +++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl @@ -15,10 +15,7 @@ $status = 0; $iiop_port = 27532; $tp_iiop_port = 27533; -$continuous = ($^O eq 'hpux'); - -$extra_server_args = ($continuous ? "-ORBSvcConf continuous$PerlACE::svcconf_ext " : '') . - "-d 1 -ORBEndpoint iiop://1.2\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.2\@:$tp_iiop_port"; +$extra_server_args = "-d 1 -ORBEndpoint iiop://1.2\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.2\@:$tp_iiop_port"; @iorfiles = ( diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl index cc019b226fc..1a3af766444 100755 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl @@ -12,9 +12,6 @@ $server_dynamic_threads = 0; $status = 0; -$continuous = ($^O eq 'hpux'); -$common_args = ($continuous ? "-ORBSvcConf continuous$PerlACE::svcconf_ext" : ''); - my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; @@ -70,7 +67,7 @@ sub run_test my @parms = @_; $arg = $parms[0]; - $SV = $server->CreateProcess ("server", "$common_args -s $server_static_threads -d $server_dynamic_threads -o $server_iorfile"); + $SV = $server->CreateProcess ("server", "-s $server_static_threads -d $server_dynamic_threads -o $server_iorfile"); $server_status = $SV->Spawn (); if ($server_status == -1) { @@ -94,7 +91,7 @@ sub run_test } } - $CL[$i] = $client->CreateProcess ("client", "$common_args $arg"); + $CL[$i] = $client->CreateProcess ("client", "$arg"); $CL[$i]->Spawn (); $client_status = $CL[$i]->WaitKill ($client->ProcessStartWaitInterval () + 80); diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf b/TAO/tests/RTCORBA/Server_Declared/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl index 494b89cbd07..1bb249beafc 100755 --- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl @@ -55,15 +55,6 @@ if ($^O eq "MSWin32") { $server_args = "-a 1 -b 2"; } -elsif ($^O eq "hpux") { - $continuous = 1; - $server_args = - "-a 17 -b 29"; -} - -if ($continuous) { - $server_args .= " -ORBSvcConf continuous$PerlACE::svcconf_ext"; -} $SV = $server->CreateProcess ("server", "-p $server_iorfile1 -o $server_iorfile2 $server_args"); $CL = $client->CreateProcess ("client", "-p file://$client_iorfile1 -o file://$client_iorfile2"); diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl index b88220167c0..ae79da36238 100755 --- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl @@ -32,7 +32,6 @@ if ($client->PutFile ($svc_conf.'.xml') == -1) { $number_of_clients = 4; $status = 0; -$continuous = ($^O eq 'hpux'); @configurations = ({ @@ -77,10 +76,6 @@ sub run_clients $SV = $server->CreateProcess ("server"); -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp index fbc9e7f8c4a..ffd86dd588a 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp @@ -15,7 +15,6 @@ test_i::method (CORBA::ULong request_number, CORBA::ULong work) { ACE_Time_Value start (0); - // HPUX seems to require this cast start.msec (static_cast<long> (start_time)); ACE_DEBUG ((LM_DEBUG, "server:\t%d took\t%dms\n", @@ -39,7 +38,7 @@ void test_i::shutdown (CORBA::Long start_time) { ACE_Time_Value start (0); - start.msec (static_cast<long> (start_time)); // HPUX seems to require this cast + start.msec (static_cast<long> (start_time)); ACE_DEBUG ((LM_DEBUG, "server: Shutting down... (%dms)\n", (ACE_OS::gettimeofday() - start).msec ())); this->orb_->shutdown (false); |