From dd1ab461b3e7a991cadc206004be0d86c608c6b5 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 28 May 2003 08:28:55 +0000 Subject: ChangeLogTag: Wed May 28 08:27:12 UTC 2003 Johnny Willemsen --- TAO/ChangeLog | 7 ++++++- TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 211f189427e..ac705e9a443 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed May 28 08:28:12 UTC 2003 Johnny Willemsen + + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + Fixed warning in SunOS build + Tue May 27 17:37:21 2003 Balachandran Natarajan * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp: @@ -7,7 +12,7 @@ Tue May 27 17:37:21 2003 Balachandran Natarajan specialization which the compiler couldn't see. The fix essentially moved the explicit template instantiations after the specialization so that the compiler doesn't get confused when - using explicit template instantiations. + using explicit template instantiations. Tue May 27 15:17:31 2003 Jeff Parsons diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 70b59a39698..a5f0a0b2871 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -416,8 +416,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - unsigned long timeout_ = ACE_OS::strtoul(opt, 0, 10); - this->consumer_control_timeout_.usec(timeout_); + unsigned long timeout = ACE_OS::strtoul(opt, 0, 10); + this->consumer_control_timeout_.usec(timeout); arg_shifter.consume_arg (); } } @@ -429,8 +429,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - unsigned long timeout_ = ACE_OS::strtoul(opt, 0, 10); - this->supplier_control_timeout_.usec(timeout_); + unsigned long timeout = ACE_OS::strtoul(opt, 0, 10); + this->supplier_control_timeout_.usec(timeout); arg_shifter.consume_arg (); } } -- cgit v1.2.1