Removed HPUX support

76 files changed, 11 insertions, 290 deletions

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);