diff options
| -rw-r--r-- | TAO/ChangeLog | 30 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp | 13 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp | 9 |
3 files changed, 32 insertions, 20 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 10652cbd7ed..a7dda5fe005 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,24 +1,32 @@ +Fri May 14 22:04:23 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/RTCORBA/Linear_Network_Priority_Mapping.cpp (to_network): + * tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp + (to_network): + + Fixed "conversion from double to int" warnings. + Fri May 14 15:38:09 2004 Irfan Pyarali <irfan@oomworks.com> - * tests\RTCORBA\Diffserv\server.cpp (main): + * tests/RTCORBA/Diffserv/server.cpp (main): Minor fix. Fri May 14 15:29:36 2004 Irfan Pyarali <irfan@oomworks.com> - * tao\RTCORBA\Linear_Network_Priority_Mapping: + * tao/RTCORBA/Linear_Network_Priority_Mapping: Several changes were made to simplify this class. <increment_>, <max_> and <min_> were removed. Conversion from corba to - network in to_network() was corrected. + network in to_network() was corrected. - * tao\IIOP_Connection_Handler.cpp (set_dscp_codepoint): + * tao/IOP_Connection_Handler.cpp (set_dscp_codepoint): "Failed to set Diffserv" message was incorrectly getting printed out. IPDSFIELD_DSCP_DEFAULT was made a valid DiffServ code point. - * tests\RTCORBA\Diffserv\server.cpp: + * tests/RTCORBA/Diffserv/server.cpp: test_method() was modified since there is no passing or respecting of corba (thread) priorities. Only network @@ -27,14 +35,14 @@ Fri May 14 15:29:36 2004 Irfan Pyarali <irfan@oomworks.com> server. The first one in the RootPOA and the other one in a POA with the correct ServerProtocolPolicy. - * tests\RTCORBA\Diffserv\client.cpp: + * tests/RTCORBA/Diffserv/client.cpp: Serveral changes were made to correct and simplify code in this file. PolicyCurrent was used rather than using the ORB_Core. Command line options were also simplified. Server is shutdown only if specified. - * tests\RTCORBA\Diffserv\Custom_Network_Priority_Mapping: + * tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping: Several changes were made to simplify this class. <increment_>, <corba_priority_>, <max_> and <min_> were removed. @@ -45,11 +53,11 @@ Fri May 14 15:29:36 2004 Irfan Pyarali <irfan@oomworks.com> Fri May 14 09:43:03 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/DynamicInterface/DII_Invocation.cpp (handle_user_exception): - - In the loop that checks for a match with the exception list, - changed the local variable holding the list item to + + In the loop that checks for a match with the exception list, + changed the local variable holding the list item to CORBA::TypeCode_var, since the list's item() method duplicates - the type code it returns. Thanks to Vinod Kumar + the type code it returns. Thanks to Vinod Kumar <vinod_kumar@agilent.com> for reporting the potential memory leak. diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp index 707af40bae8..0d06f2f09dd 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp @@ -15,7 +15,9 @@ # include "Linear_Network_Priority_Mapping.i" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID(Strategies, Linear_Network_Priority_Mapping, "$Id$") +ACE_RCSID (RTCORBA, + Linear_Network_Priority_Mapping, + "$Id$") #define IPDSFIELD_DSCP_DEFAULT 0x00 #define IPDSFIELD_DSCP_CS1 0x08 @@ -98,18 +100,19 @@ TAO_Linear_Network_Priority_Mapping::TAO_Linear_Network_Priority_Mapping (long) } CORBA::Boolean -TAO_Linear_Network_Priority_Mapping::to_network (RTCORBA::Priority corba_priority, - RTCORBA::NetworkPriority &network_priority) +TAO_Linear_Network_Priority_Mapping::to_network ( + RTCORBA::Priority corba_priority, + RTCORBA::NetworkPriority &network_priority) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "TAO_Linear_Network_Priority_Mapping::to_network corba_priority %d\n", corba_priority)); - int total_slots = sizeof (dscp) / sizeof (int); + const int total_slots = sizeof (dscp) / sizeof (int); int array_slot = - ((corba_priority - RTCORBA::minPriority) / double (RTCORBA::maxPriority - RTCORBA::minPriority)) * total_slots; + static_cast<int> (((corba_priority - RTCORBA::minPriority) / double (RTCORBA::maxPriority - RTCORBA::minPriority)) * total_slots); if (array_slot == total_slots) array_slot -= 1; diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp index c5b3ebfd7ba..0c177bcfb02 100644 --- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp +++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp @@ -96,18 +96,19 @@ TAO_Custom_Network_Priority_Mapping::corba_priority (RTCORBA::Priority corba_pri } CORBA::Boolean -TAO_Custom_Network_Priority_Mapping::to_network (RTCORBA::Priority, - RTCORBA::NetworkPriority &network_priority) +TAO_Custom_Network_Priority_Mapping::to_network ( + RTCORBA::Priority, + RTCORBA::NetworkPriority &network_priority) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "TAO_Custom_Network_Priority_Mapping::to_network corba_priority %d\n", this->corba_priority_)); - int total_slots = sizeof (dscp) / sizeof (int); + const int total_slots = sizeof (dscp) / sizeof (int); int array_slot = - ((this->corba_priority_ - RTCORBA::minPriority) / double (RTCORBA::maxPriority - RTCORBA::minPriority)) * total_slots; + static_cast<int> (((this->corba_priority_ - RTCORBA::minPriority) / double (RTCORBA::maxPriority - RTCORBA::minPriority)) * total_slots); if (array_slot == total_slots) array_slot -= 1; |