diff options
Diffstat (limited to 'TAO/orbsvcs')
41 files changed, 1 insertions, 140 deletions
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"); |