diff options
23 files changed, 56 insertions, 22 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0b9b7b7a6eb..20ae126432c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,30 @@ +Wed Mar 31 17:56:59 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * examples/Advanced/ch_12/icp.h: + * examples/Advanced/ch_18/icp.h: + * examples/Advanced/ch_21/icp.h: + * examples/Advanced/ch_8_and_10/icp.h: + * examples/Simulator/Event_Supplier/Event_Supplier.mpc: + * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc: + * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc: + * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc: + * orbsvcs/examples/LoadBalancing/LoadBalancing.mpc: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp: + * orbsvcs/performance-tests/LoadBalancing/LoadBalancing.mpc: + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc: + * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc: + * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc: + * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc: + * performance-tests/Anyop/Anyop.mpc: + * performance-tests/Latency/Collocation/Collocation.mpc: + + Fixes for fuzz warnings. + Wed Mar 31 15:29:23 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PICurrent_Copy_Callback.h: diff --git a/TAO/examples/Advanced/ch_12/icp.h b/TAO/examples/Advanced/ch_12/icp.h index bbcc0b84f08..5029a06803d 100644 --- a/TAO/examples/Advanced/ch_12/icp.h +++ b/TAO/examples/Advanced/ch_12/icp.h @@ -38,10 +38,6 @@ extern "C" const void *value); } -#if defined(_MSC_VAR) && (_MSC_VAR >= 1200) -#pragma warning(pop) -#endif/*_MSC_VAR*/ - size_t min(const size_t len1, const size_t len2); #endif /* _ICP_H */ diff --git a/TAO/examples/Advanced/ch_18/icp.h b/TAO/examples/Advanced/ch_18/icp.h index 69686ee43b8..69c2dab85f1 100644 --- a/TAO/examples/Advanced/ch_18/icp.h +++ b/TAO/examples/Advanced/ch_18/icp.h @@ -39,10 +39,6 @@ extern "C" { ); } -#if defined(_MSC_VAR) && (_MSC_VAR >= 1200) -#pragma warning(pop) -#endif/*_MSC_VAR*/ - size_t min(const size_t len1, const size_t len2); #endif /* _ICP_H */ diff --git a/TAO/examples/Advanced/ch_21/icp.h b/TAO/examples/Advanced/ch_21/icp.h index ee271ca213f..b413a9157df 100644 --- a/TAO/examples/Advanced/ch_21/icp.h +++ b/TAO/examples/Advanced/ch_21/icp.h @@ -40,10 +40,6 @@ extern "C" { ); } -#if defined(_MSC_VAR) && (_MSC_VAR >= 1200) -#pragma warning(pop) -#endif/*_MSC_VAR*/ - size_t min(const size_t len1, const size_t len2); #endif /* _ICP_H */ diff --git a/TAO/examples/Advanced/ch_8_and_10/icp.h b/TAO/examples/Advanced/ch_8_and_10/icp.h index fb41fb5dc64..f0a53a748ab 100644 --- a/TAO/examples/Advanced/ch_8_and_10/icp.h +++ b/TAO/examples/Advanced/ch_8_and_10/icp.h @@ -37,9 +37,6 @@ extern "C" { const void * value ); } -#if defined(_MSC_VAR) && (_MSC_VAR >= 1200) -#pragma warning(pop) -#endif/*_MSC_VAR*/ size_t min(const size_t len1, const size_t len2); diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc index 7cdac7c5849..bb4348b6d0c 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc +++ b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*Event_Sup): rtoldevent, namingexe { exename = Event_Sup idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc index c29c0a01467..8f5d3c09116 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc @@ -1,3 +1,4 @@ +// $Id$ project: namingexe, dslogadmin { includes += $(TAO_ROOT)/orbsvcs -}
\ No newline at end of file +} diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc index 206aca95905..3ad79188922 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc @@ -1,3 +1,4 @@ +// $Id$ project: namingexe, dseventlogadmin { includes += $(TAO_ROOT)/orbsvcs -}
\ No newline at end of file +} diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc index cb728dea7c6..ea990697888 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc @@ -1,4 +1,5 @@ +// $Id$ project: namingexe, dsnotifylogadmin { exename = Notify_Logging_Service includes += $(TAO_ROOT)/orbsvcs -}
\ No newline at end of file +} diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc index b94da5b56a2..91a24c347dc 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc +++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*Server): taoexe, loadbalancing { includes += $(TAO_ROOT)/orbsvcs requires += exceptions diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 1da63d0ec1e..e10111e23fb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -768,15 +768,20 @@ void TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL) } } -void TAO::PG_Object_Group::initial_populate (ACE_ENV_SINGLE_ARG_DECL) +void +TAO::PG_Object_Group::initial_populate (ACE_ENV_SINGLE_ARG_DECL) { InternalGuard guard(this->internals_); if ( this->get_membership_style() == PortableGroup::MEMB_INF_CTRL ) { - PortableGroup::InitialNumberMembersValue initial_number_members = this->get_initial_number_members (); - if (members_.current_size () < initial_number_members) + PortableGroup::InitialNumberMembersValue initial_number_members = + this->get_initial_number_members (); + + if (this->members_.current_size () < initial_number_members) { - this->create_members (initial_number_members ACE_ENV_ARG_PARAMETER); + this->create_members (initial_number_members + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } } } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/performance-tests/LoadBalancing/LoadBalancing.mpc index c5f3cbf1e43..4f1c2eb5531 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LoadBalancing.mpc +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LoadBalancing.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*Performance_Server): loadbalancing, strategies { includes += $(TAO_ROOT)/orbsvcs diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc index ed3811463f8..67a55c6b149 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc @@ -1,3 +1,4 @@ +// $Id$ project: orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc index 517bfc5aac2..9d7e179afd0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc index 2ae44137972..99ff44ff629 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc index 343941f0a47..0ce386d40fa 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc index e08b71bae05..d1e36f33ebb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc index e08b71bae05..d1e36f33ebb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc index e7ec0ff6aa2..29dedba0380 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc @@ -1,2 +1,3 @@ +// $Id$ project: ifr_client { } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc index 72206905edb..304166b4d6b 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*Server): loadbalancing { includes += $(TAO_ROOT)/orbsvcs diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc index 670313d2ea8..61cdd3e1ed6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc @@ -1,3 +1,4 @@ +// $Id$ project(*Client): loadbalancing { includes += $(TAO_ROOT)/orbsvcs } diff --git a/TAO/performance-tests/Anyop/Anyop.mpc b/TAO/performance-tests/Anyop/Anyop.mpc index c1c9cbd34f4..8aa28b23573 100644 --- a/TAO/performance-tests/Anyop/Anyop.mpc +++ b/TAO/performance-tests/Anyop/Anyop.mpc @@ -1,3 +1,4 @@ +// $Id$ project: taoexe { Source_Files { testC.cpp diff --git a/TAO/performance-tests/Latency/Collocation/Collocation.mpc b/TAO/performance-tests/Latency/Collocation/Collocation.mpc index 9916520c6a4..653eff71362 100644 --- a/TAO/performance-tests/Latency/Collocation/Collocation.mpc +++ b/TAO/performance-tests/Latency/Collocation/Collocation.mpc @@ -1,2 +1,3 @@ +// $Id$ project(Latency*): taoexe, portableserver, strategies { } |