summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog685
-rw-r--r--TAO/TAO_IDL/ast/ast_decl.cpp6
-rw-r--r--TAO/TAO_IDL/ast/ast_type.cpp21
-rw-r--r--TAO/TAO_IDL/be/be_codegen.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_helper.cpp26
-rw-r--r--TAO/TAO_IDL/be/be_interface.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_interface_strategy.cpp56
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp20
-rw-r--r--TAO/TAO_IDL/be_include/be_helper.h8
-rw-r--r--TAO/TAO_IDL/driver/drv_args.cpp6
-rw-r--r--TAO/TAO_IDL/driver/drv_preproc.cpp6
-rw-r--r--TAO/TAO_IDL/fe/lex.yy.cpp6
-rw-r--r--TAO/TAO_IDL/include/idl_narrow.h40
-rw-r--r--TAO/TAO_IDL/include/utl_string.h2
-rw-r--r--TAO/TAO_IDL/util/utl_string.cpp2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/MCast.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTP.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/TCP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/UDP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/sfp.cpp27
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Event_Channel.i2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp20
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp96
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp56
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp20
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp33
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp13
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp109
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i3
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp13
-rw-r--r--TAO/tao/Asynch_Queued_Message.cpp3
-rw-r--r--TAO/tao/CDR_Encaps_Codec.cpp4
-rw-r--r--TAO/tao/CORBALOC_Parser.cpp8
-rw-r--r--TAO/tao/ClientRequestInfo_i.cpp15
-rw-r--r--TAO/tao/Codeset_Manager.cpp3
-rw-r--r--TAO/tao/Connection_Handler.cpp4
-rw-r--r--TAO/tao/Domain/DomainS.cpp8
-rw-r--r--TAO/tao/DynamicAny/DynArray_i.cpp16
-rw-r--r--TAO/tao/DynamicAny/DynSequence_i.cpp6
-rw-r--r--TAO/tao/DynamicAny/DynStruct_i.cpp3
-rw-r--r--TAO/tao/DynamicInterface/DII_Invocation.inl3
-rw-r--r--TAO/tao/DynamicInterface/Request.cpp6
-rw-r--r--TAO/tao/DynamicInterface/Server_Request.cpp3
-rw-r--r--TAO/tao/Exception.cpp3
-rw-r--r--TAO/tao/GIOP_Message_Base.cpp3
-rw-r--r--TAO/tao/GIOP_Message_Lite.cpp3
-rw-r--r--TAO/tao/IIOP_Acceptor.cpp19
-rw-r--r--TAO/tao/IIOP_Acceptor.h2
-rw-r--r--TAO/tao/IIOP_Connection_Handler.cpp4
-rw-r--r--TAO/tao/IIOP_Profile.cpp34
-rw-r--r--TAO/tao/IIOP_Profile.h4
-rw-r--r--TAO/tao/Leader_Follower.cpp2
-rw-r--r--TAO/tao/LocalObject.cpp3
-rw-r--r--TAO/tao/MCAST_Parser.cpp21
-rw-r--r--TAO/tao/Messaging/MessagingS.cpp4
-rw-r--r--TAO/tao/ORB.cpp10
-rw-r--r--TAO/tao/ORB_Core.cpp13
-rw-r--r--TAO/tao/Object.cpp3
-rw-r--r--TAO/tao/PortableServer/ImR_LocatorS.cpp4
-rw-r--r--TAO/tao/PortableServer/ImplRepoS.cpp12
-rw-r--r--TAO/tao/PortableServer/Key_Adapters.cpp12
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.cpp5
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.h2
-rw-r--r--TAO/tao/PortableServer/POA.cpp24
-rw-r--r--TAO/tao/PortableServer/POAManager.i6
-rw-r--r--TAO/tao/PortableServer/PolicyS.cpp4
-rw-r--r--TAO/tao/PortableServer/Servant_Base.cpp6
-rw-r--r--TAO/tao/PortableServer/Servant_Base.i3
-rw-r--r--TAO/tao/PortableServer/ServerRequestInfo.cpp11
-rw-r--r--TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp4
-rw-r--r--TAO/tao/Profile.cpp14
-rw-r--r--TAO/tao/Profile.h4
-rw-r--r--TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp4
-rw-r--r--TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp2
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.cpp2
-rw-r--r--TAO/tao/Service_Context.cpp8
-rw-r--r--TAO/tao/Strategies/DIOP_Acceptor.cpp7
-rw-r--r--TAO/tao/Strategies/DIOP_Acceptor.h2
-rw-r--r--TAO/tao/Strategies/DIOP_Connection_Handler.cpp6
-rw-r--r--TAO/tao/Strategies/DIOP_Profile.cpp41
-rw-r--r--TAO/tao/Strategies/DIOP_Profile.h4
-rw-r--r--TAO/tao/Strategies/SHMIOP_Acceptor.cpp3
-rw-r--r--TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp4
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.cpp41
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.h4
-rw-r--r--TAO/tao/Strategies/UIOP_Connection_Handler.cpp4
-rw-r--r--TAO/tao/Strategies/UIOP_Profile.cpp2
-rw-r--r--TAO/tao/Strategies/UIOP_Profile.h4
-rw-r--r--TAO/tao/Synch_Queued_Message.cpp2
-rw-r--r--TAO/tao/TAO_Server_Request.h2
-rw-r--r--TAO/tao/TAO_Server_Request.i2
-rw-r--r--TAO/tao/Tagged_Components.cpp4
-rw-r--r--TAO/tao/Transport.cpp4
-rw-r--r--TAO/tao/Transport.h6
-rw-r--r--TAO/tao/Transport.inl4
-rw-r--r--TAO/tao/Transport_Cache_Manager.cpp2
-rw-r--r--TAO/tao/Typecode.cpp5
-rw-r--r--TAO/tao/corbafwd.cpp2
-rw-r--r--TAO/tao/default_resource.cpp2
-rw-r--r--TAO/tao/default_resource.h2
-rw-r--r--TAO/tao/params.cpp4
157 files changed, 1189 insertions, 897 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ebd2f201d99..b360d1fc103 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,164 @@
+Wed Apr 30 07:26:37 2003 Chad Elliott <elliott_c@ociweb.com>
+
+ * TAO_IDL/ast/ast_decl.cpp:
+ * TAO_IDL/ast/ast_type.cpp:
+ * TAO_IDL/be/be_codegen.cpp:
+ * TAO_IDL/be/be_helper.cpp:
+ * TAO_IDL/be/be_interface.cpp:
+ * TAO_IDL/be/be_interface_strategy.cpp:
+ * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+ * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+ * TAO_IDL/be_include/be_helper.h:
+ * TAO_IDL/driver/drv_args.cpp:
+ * TAO_IDL/driver/drv_preproc.cpp:
+ * TAO_IDL/fe/lex.yy.cpp:
+ * TAO_IDL/include/idl_narrow.h:
+ * TAO_IDL/include/utl_string.h:
+ * TAO_IDL/util/utl_string.cpp:
+ * orbsvcs/Naming_Service/Naming_Service.h:
+ * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+ * orbsvcs/orbsvcs/AV/AV_Core.cpp:
+ * orbsvcs/orbsvcs/AV/MCast.cpp:
+ * orbsvcs/orbsvcs/AV/QoS_UDP.cpp:
+ * orbsvcs/orbsvcs/AV/RTCP.cpp:
+ * orbsvcs/orbsvcs/AV/RTCP_Channel.cpp:
+ * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp:
+ * orbsvcs/orbsvcs/AV/RTP.cpp:
+ * orbsvcs/orbsvcs/AV/TCP.cpp:
+ * orbsvcs/orbsvcs/AV/UDP.cpp:
+ * orbsvcs/orbsvcs/AV/sfp.cpp:
+ * orbsvcs/orbsvcs/Event/Dispatching_Modules.i:
+ * orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp:
+ * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp:
+ * orbsvcs/orbsvcs/Event/EC_And_Filter.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp:
+ * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
+ * orbsvcs/orbsvcs/Event/Event_Channel.i:
+ * orbsvcs/orbsvcs/Event/Event_Channel.cpp:
+ * orbsvcs/orbsvcs/Event/RT_Task.cpp:
+ * orbsvcs/orbsvcs/Event_Utilities.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+ * orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp:
+ * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+ * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp:
+ * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
+ * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
+ * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
+ * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
+ * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
+ * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp:
+ * orbsvcs/orbsvcs/IFRService/StructDef_i.cpp:
+ * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp:
+ * orbsvcs/orbsvcs/IOR_Multicast.cpp:
+ * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+ * orbsvcs/orbsvcs/Log/Log_i.cpp:
+ * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp:
+ * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp:
+ * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
+ * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+ * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
+ * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp:
+ * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+ * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+ * orbsvcs/orbsvcs/Notify/PropertySeq.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+ * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+ * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+ * orbsvcs/orbsvcs/Sched/DynSched.cpp:
+ * orbsvcs/orbsvcs/Sched/SchedEntry.i:
+ * orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp:
+ * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
+ * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
+ * orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
+ * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp:
+ * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp:
+ * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
+ * orbsvcs/orbsvcs/Trader/Trader.cpp:
+ * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+ * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
+ * tao/Asynch_Queued_Message.cpp:
+ * tao/CDR_Encaps_Codec.cpp:
+ * tao/CORBALOC_Parser.cpp:
+ * tao/ClientRequestInfo_i.cpp:
+ * tao/Codeset_Manager.cpp:
+ * tao/Connection_Handler.cpp:
+ * tao/Domain/DomainS.cpp:
+ * tao/DynamicAny/DynArray_i.cpp:
+ * tao/DynamicAny/DynSequence_i.cpp:
+ * tao/DynamicAny/DynStruct_i.cpp:
+ * tao/DynamicInterface/DII_Invocation.inl:
+ * tao/DynamicInterface/Request.cpp:
+ * tao/DynamicInterface/Server_Request.cpp:
+ * tao/Exception.cpp:
+ * tao/GIOP_Message_Base.cpp:
+ * tao/GIOP_Message_Lite.cpp:
+ * tao/IIOP_Acceptor.h:
+ * tao/IIOP_Acceptor.cpp:
+ * tao/IIOP_Connection_Handler.cpp:
+ * tao/IIOP_Profile.h:
+ * tao/IIOP_Profile.cpp:
+ * tao/Leader_Follower.cpp:
+ * tao/LocalObject.cpp:
+ * tao/MCAST_Parser.cpp:
+ * tao/Messaging/MessagingS.cpp:
+ * tao/ORB.cpp:
+ * tao/ORB_Core.cpp:
+ * tao/Object.cpp:
+ * tao/PortableServer/ImR_LocatorS.cpp:
+ * tao/PortableServer/ImplRepoS.cpp:
+ * tao/PortableServer/Key_Adapters.cpp:
+ * tao/PortableServer/Object_Adapter.h:
+ * tao/PortableServer/Object_Adapter.cpp:
+ * tao/PortableServer/POA.cpp:
+ * tao/PortableServer/POAManager.i:
+ * tao/PortableServer/PolicyS.cpp:
+ * tao/PortableServer/Servant_Base.i:
+ * tao/PortableServer/Servant_Base.cpp:
+ * tao/PortableServer/ServerRequestInfo.cpp:
+ * tao/PortableServer/Strategized_Object_Proxy_Broker.cpp:
+ * tao/Profile.h:
+ * tao/Profile.cpp:
+ * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+ * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+ * tao/RTPortableServer/RT_POA.cpp:
+ * tao/Service_Context.cpp:
+ * tao/Strategies/DIOP_Acceptor.h:
+ * tao/Strategies/DIOP_Acceptor.cpp:
+ * tao/Strategies/DIOP_Connection_Handler.cpp:
+ * tao/Strategies/DIOP_Profile.h:
+ * tao/Strategies/DIOP_Profile.cpp:
+ * tao/Strategies/SHMIOP_Acceptor.cpp:
+ * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+ * tao/Strategies/SHMIOP_Profile.h:
+ * tao/Strategies/SHMIOP_Profile.cpp:
+ * tao/Strategies/UIOP_Connection_Handler.cpp:
+ * tao/Strategies/UIOP_Profile.h:
+ * tao/Strategies/UIOP_Profile.cpp:
+ * tao/Synch_Queued_Message.cpp:
+ * tao/TAO_Server_Request.h:
+ * tao/TAO_Server_Request.i:
+ * tao/Tagged_Components.cpp:
+ * tao/Transport.h:
+ * tao/Transport.inl:
+ * tao/Transport.cpp:
+ * tao/Transport_Cache_Manager.cpp:
+ * tao/Typecode.cpp:
+ * tao/corbafwd.cpp:
+ * tao/default_resource.h:
+ * tao/default_resource.cpp:
+ * tao/params.cpp:
+
+ Remove build warnings on Windows XP 64-bit.
+
Wed Apr 30 12:52:50 2003 Simon McQueen <sm@prismtechnologies.com>
* examples/Simple/time/client_static.dsp:
@@ -31,10 +192,10 @@ Wed Apr 30 12:52:50 2003 Simon McQueen <sm@prismtechnologies.com>
Wed Apr 30 11:30:18 2003 Edward Scott <eas@prismtechnologies.com>
- * examples/POA/Generic_Servant/Makefile.generic_servant:
- * examples/POA/Generic_Servant/Makefile.client:
+ * examples/POA/Generic_Servant/Makefile.generic_servant:
+ * examples/POA/Generic_Servant/Makefile.client:
- Small fix to Makefile.client. Updated dependencies.
+ Small fix to Makefile.client. Updated dependencies.
Tue Apr 29 14:10:53 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
@@ -88,12 +249,12 @@ Tue Apr 29 10:58:45 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
Tue Apr 29 16:13:46 2003 Simon McQueen <sm@prismtechnologies.com>
- * tests/Abstract_Interface/client.cpp: Fixed build error.
+ * tests/Abstract_Interface/client.cpp: Fixed build error.
Tue Apr 29 14:47:40 2003 Dave Smith <dts@prismtechnologies.com>
- * tao/IOP_IORC.h:
- * tao/diffs/IOP_IOR.diff:
+ * tao/IOP_IORC.h:
+ * tao/diffs/IOP_IOR.diff:
Removed clash with symbol "IOR" defined in
/usr/include/machine/inline.h on HPUX.
@@ -124,47 +285,47 @@ Mon Apr 28 18:59:01 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
Mon Apr 28 12:24:39 2003 Irfan Pyarali <irfan@oomworks.com>
- * tao/Strategies/advanced_resource.cpp:
+ * tao/Strategies/advanced_resource.cpp:
- load_default_protocols(): Reset
- <TAO_Default_Resource_Factory::protocol_factories_> after
- copying the protocols from it to avoid double deletes.
+ load_default_protocols(): Reset
+ <TAO_Default_Resource_Factory::protocol_factories_> after
+ copying the protocols from it to avoid double deletes.
- ~TAO_Advanced_Resource_Factory(): delete all protocols in
- protocol factory to avoid memory leak.
+ ~TAO_Advanced_Resource_Factory(): delete all protocols in
+ protocol factory to avoid memory leak.
- * tao/RTPortableServer/RT_POA.cpp (server_protocol):
+ * tao/RTPortableServer/RT_POA.cpp (server_protocol):
- Fixed code formatting.
+ Fixed code formatting.
- * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+ * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
- Avoid a memory leak in pre_invoke_remote_request() by assigning
- the result from POA::server_protocol() to a CORBA::Policy_var
- instead of a CORBA::Policy_ptr.
+ Avoid a memory leak in pre_invoke_remote_request() by assigning
+ the result from POA::server_protocol() to a CORBA::Policy_var
+ instead of a CORBA::Policy_ptr.
- * tao/orbconf.h:
+ * tao/orbconf.h:
- Only set TAO_DEFAULT_ROOTPOA_NAME if not already set by the
- user.
+ Only set TAO_DEFAULT_ROOTPOA_NAME if not already set by the
+ user.
Mon Apr 28 09:13:17 2003 Venkita Subramonian <venkita@cs.wustl.edu>
- * orbsvcs/orbsvcs/RTKokyuEvent.dsp: Added the xxx_BUILD_DLL
- preprocessor definition to get rid of compile warnings on MSVC.
+ * orbsvcs/orbsvcs/RTKokyuEvent.dsp: Added the xxx_BUILD_DLL
+ preprocessor definition to get rid of compile warnings on MSVC.
Mon Apr 28 07:05:55 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/PortableServer/PortableServerC.i (demarshal_value): Added
- ACE_INLINE to marshal_value and demarshal_value. This should fix
- link errors in MSVC6. Thanks to Simon McQueen for reporting this.
+ * tao/PortableServer/PortableServerC.i (demarshal_value): Added
+ ACE_INLINE to marshal_value and demarshal_value. This should fix
+ link errors in MSVC6. Thanks to Simon McQueen for reporting this.
Mon Apr 28 06:52:40 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/IOP_IORC.cpp: Removed duplicate explicit template
- instantiations.
+ * tao/IOP_IORC.cpp: Removed duplicate explicit template
+ instantiations.
- * tao/Array_VarOut_T.inl: Fixed a compilation error in BCB6.
+ * tao/Array_VarOut_T.inl: Fixed a compilation error in BCB6.
Mon Apr 28 06:43:50 2003 Chad Elliott <elliott_c@ociweb.com>
@@ -174,293 +335,293 @@ Mon Apr 28 06:43:50 2003 Chad Elliott <elliott_c@ociweb.com>
Sun Apr 27 20:42:06 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/Transport_Acceptor.h: Fixed a forward declaration that
- caused compile errors in VC++.
+ * tao/Transport_Acceptor.h: Fixed a forward declaration that
+ caused compile errors in VC++.
Sun Apr 27 20:08:27 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: Fixed a typo that blasted
- the builds.
+ * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: Fixed a typo that blasted
+ the builds.
Sun Apr 27 17:50:16 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tests/Bug_1482_Regression/Makefile: Updated dependencies.
+ * tests/Bug_1482_Regression/Makefile: Updated dependencies.
Sun Apr 27 17:45:05 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/IOP_IORC.h:
- * tao/IOP_CodeC.h: Generated code to include "ace/post.h". This
- should fix warnings in BCB6 builds. Thanks to Johnny for
- alerting me on this.
+ * tao/IOP_IORC.h:
+ * tao/IOP_CodeC.h: Generated code to include "ace/post.h". This
+ should fix warnings in BCB6 builds. Thanks to Johnny for
+ alerting me on this.
Sun Apr 27 17:34:50 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/PortableServer/PortableServerC.cpp:
- * tao/PortableServer/PortableServerC.i: Moved marshal_value ()
- method from the cpp file to the inlined file. This shodl fix
- BCB5 build problems. Thanks to Johnny for helping me with this.
+ * tao/PortableServer/PortableServerC.cpp:
+ * tao/PortableServer/PortableServerC.i: Moved marshal_value ()
+ method from the cpp file to the inlined file. This shodl fix
+ BCB5 build problems. Thanks to Johnny for helping me with this.
Sun Apr 27 11:31:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/GIOPC.{h,cpp,i}: Regenerated code
- * tao/diffs/GIOP.diff: Updated diffs
+ * tao/GIOPC.{h,cpp,i}: Regenerated code
+ * tao/diffs/GIOP.diff: Updated diffs
- * tao/IOP_IORC.cpp: Removed unwanted headers
- * tao/diffs/IOP_IOR.diff: Updated diffs.
+ * tao/IOP_IORC.cpp: Removed unwanted headers
+ * tao/diffs/IOP_IOR.diff: Updated diffs.
Sun Apr 27 11:01:15 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/GIOPC.h:
- * tao/GIOP_Utils.h:
- * tao/Messaging_PolicyValueC.h:
- * tao/Pluggable_Messaging_Utils.h:
- * tao/Reply_Dispatcher.h:
- * tao/Synch_Reply_Dispatcher.h:
- * tao/Transport.h:
- * tao/Transport_Acceptor.cpp:
- * tao/Transport_Acceptor.h: Removed totally unwanted
- includes. This was setting up totally screwed dependencies and
- increased footprint.
-
- * tao/IOP_CodecC.cpp:
- * tao/IOP_CodecC.h:
- * tao/IOP_CodecC.i:
- * tao/diffs/IOP_Codec.diff: Regenerated code and updated
- the diffs.
+ * tao/GIOPC.h:
+ * tao/GIOP_Utils.h:
+ * tao/Messaging_PolicyValueC.h:
+ * tao/Pluggable_Messaging_Utils.h:
+ * tao/Reply_Dispatcher.h:
+ * tao/Synch_Reply_Dispatcher.h:
+ * tao/Transport.h:
+ * tao/Transport_Acceptor.cpp:
+ * tao/Transport_Acceptor.h: Removed totally unwanted
+ includes. This was setting up totally screwed dependencies and
+ increased footprint.
+
+ * tao/IOP_CodecC.cpp:
+ * tao/IOP_CodecC.h:
+ * tao/IOP_CodecC.i:
+ * tao/diffs/IOP_Codec.diff: Regenerated code and updated
+ the diffs.
Sun Apr 27 09:37:06 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/IOP_IORC.h:
- * tao/IOP_IORC.cpp:
- * tao/IOP_IORC.i: Regenerated the code. Somehow the regenarted
- code never got merged back from the branch.
+ * tao/IOP_IORC.h:
+ * tao/IOP_IORC.cpp:
+ * tao/IOP_IORC.i: Regenerated the code. Somehow the regenarted
+ code never got merged back from the branch.
- * tao/diffs/IOP_IOR.diff: Updated diff file.
+ * tao/diffs/IOP_IOR.diff: Updated diff file.
Sat Apr 26 16:08:15 2003 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
- * tao/PortableServer/Servant_Base.{h,cpp} Added an accessor method
- that returns the current reference count. Thanks to
- Zsolt Zsoldos <zsolt.zsoldos@rogers.com> for suggesting this.
+ * tao/PortableServer/Servant_Base.{h,cpp} Added an accessor method
+ that returns the current reference count. Thanks to
+ Zsolt Zsoldos <zsolt.zsoldos@rogers.com> for suggesting this.
- * utils/IOR-parser/ior-handler.cpp (interpretIor): Fixed this utility
- so that it correctly handles GIOP 1.2! Thanks to Dave Ryan
- <djryan7@pacbell.net> for this fix.
+ * utils/IOR-parser/ior-handler.cpp (interpretIor): Fixed this utility
+ so that it correctly handles GIOP 1.2! Thanks to Dave Ryan
+ <djryan7@pacbell.net> for this fix.
Sat Apr 26 11:12:53 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: Fixed a compile error in
- builds where exceptions are turned off.
+ * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: Fixed a compile error in
+ builds where exceptions are turned off.
Sat Apr 26 11:08:10 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/Messaging/Messaging_No_ImplC.cpp: Missing template
- instantiations.
+ * tao/Messaging/Messaging_No_ImplC.cpp: Missing template
+ instantiations.
Sat Apr 26 10:58:31 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/PolicyC.cpp: Removed duplicate template instantiations.
+ * tao/PolicyC.cpp: Removed duplicate template instantiations.
Sat Apr 26 10:52:46 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/PortableServer/ImR_LocatorC.i: Fixed a warning in VC++ builds.
+ * tao/PortableServer/ImR_LocatorC.i: Fixed a warning in VC++ builds.
Sat Apr 26 08:42:46 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/Environment.cpp: Removed operator= for
- CORBA::Environment_var since they shoudl be taken care by the
- template classes.
+ * tao/Environment.cpp: Removed operator= for
+ CORBA::Environment_var since they shoudl be taken care by the
+ template classes.
Fri Apr 25 22:29:08 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: Added explicit
- template instations for the base class sequences.
+ * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: Added explicit
+ template instations for the base class sequences.
Fri Apr 25 22:26:21 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/DynamicC.cpp:
- * tao/DynamicC.h:
- * tao/DynamicC.i:
- * tao/OctetSeqC.cpp:
- * tao/OctetSeqC.h:
- * tao/OctetSeqC.i:
- * tao/PortableServer/Default_ORTC.cpp:
- * tao/PortableServer/Default_ORTC.h:
- * tao/PortableServer/Default_ORTC.i:
- * tao/PortableServer/ImR_ActivatorC.h:
- * tao/PortableServer/ImR_LocatorC.cpp:
- * tao/PortableServer/ImR_LocatorC.h:
- * tao/PortableServer/ImR_LocatorC.i:
- * tao/PortableServer/ImplRepoC.cpp:
- * tao/PortableServer/ImplRepoC.h:
- * tao/PortableServer/PortableServerC.cpp
- * tao/PortableServer/ImplRepoC.i: Regenerated ode and patched them.
-
- * tao/PortableServer/diffs/Default_ORT.diff:
- * tao/PortableServer/diffs/ImplRepo.diff:
- * tao/diffs/Dynamic.diff:
- * tao/diffs/OctetSeq.diff: Updated the diff files.
-
- With the above checkin a simple server and client should build
- without link errors when explicit template instantiations have
- been turned on.
+ * tao/DynamicC.cpp:
+ * tao/DynamicC.h:
+ * tao/DynamicC.i:
+ * tao/OctetSeqC.cpp:
+ * tao/OctetSeqC.h:
+ * tao/OctetSeqC.i:
+ * tao/PortableServer/Default_ORTC.cpp:
+ * tao/PortableServer/Default_ORTC.h:
+ * tao/PortableServer/Default_ORTC.i:
+ * tao/PortableServer/ImR_ActivatorC.h:
+ * tao/PortableServer/ImR_LocatorC.cpp:
+ * tao/PortableServer/ImR_LocatorC.h:
+ * tao/PortableServer/ImR_LocatorC.i:
+ * tao/PortableServer/ImplRepoC.cpp:
+ * tao/PortableServer/ImplRepoC.h:
+ * tao/PortableServer/PortableServerC.cpp
+ * tao/PortableServer/ImplRepoC.i: Regenerated ode and patched them.
+
+ * tao/PortableServer/diffs/Default_ORT.diff:
+ * tao/PortableServer/diffs/ImplRepo.diff:
+ * tao/diffs/Dynamic.diff:
+ * tao/diffs/OctetSeq.diff: Updated the diff files.
+
+ With the above checkin a simple server and client should build
+ without link errors when explicit template instantiations have
+ been turned on.
Fri Apr 25 17:04:34 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * TAO_IDL/be/be_type.cpp:
- * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
- * TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h: Added code
- to generate explicit template instantiations.
+ * TAO_IDL/be/be_type.cpp:
+ * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+ * TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h: Added code
+ to generate explicit template instantiations.
Fri Apr 25 15:21:58 2003 Irfan Pyarali <irfan@oomworks.com>
- * tao\RTCORBA\Thread_Pool.cpp:
+ * tao\RTCORBA\Thread_Pool.cpp:
- In create_threadpool_helper(), finalize thread pool resource in
- case of thread creation errors. This will fix a memory leak.
+ In create_threadpool_helper(), finalize thread pool resource in
+ case of thread creation errors. This will fix a memory leak.
- * tests\RTCORBA\Banded_Connections\client.cpp:
- * tests\RTCORBA\Banded_Connections\server.cpp:
+ * tests\RTCORBA\Banded_Connections\client.cpp:
+ * tests\RTCORBA\Banded_Connections\server.cpp:
- Report meaningful message in case of thread creation errors.
+ Report meaningful message in case of thread creation errors.
Fri Apr 25 08:59:12 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/IFR_Client/IFR_BaseC.cpp:
- * tao/IFR_Client/IFR_BaseC.h:
- * tao/IFR_Client/IFR_BaseC.i:
- * tao/IFR_Client/IFR_BasicC.cpp:
- * tao/IFR_Client/IFR_BasicC.h:
- * tao/IFR_Client/IFR_BasicC.i:
- * tao/IFR_Client/IFR_ComponentsC.cpp:
- * tao/IFR_Client/IFR_ComponentsC.h:
- * tao/IFR_Client/IFR_ComponentsC.i:
- * tao/IFR_Client/IFR_ExtendedC.cpp:
- * tao/IFR_Client/IFR_ExtendedC.h:
- * tao/IFR_Client/IFR_ExtendedC.i: Generated code for the IFR. This
- should compile fine if explicit template instantiations are
- used.
-
- We still have a lots of link errors that needs fixing in TAO.
+ * tao/IFR_Client/IFR_BaseC.cpp:
+ * tao/IFR_Client/IFR_BaseC.h:
+ * tao/IFR_Client/IFR_BaseC.i:
+ * tao/IFR_Client/IFR_BasicC.cpp:
+ * tao/IFR_Client/IFR_BasicC.h:
+ * tao/IFR_Client/IFR_BasicC.i:
+ * tao/IFR_Client/IFR_ComponentsC.cpp:
+ * tao/IFR_Client/IFR_ComponentsC.h:
+ * tao/IFR_Client/IFR_ComponentsC.i:
+ * tao/IFR_Client/IFR_ExtendedC.cpp:
+ * tao/IFR_Client/IFR_ExtendedC.h:
+ * tao/IFR_Client/IFR_ExtendedC.i: Generated code for the IFR. This
+ should compile fine if explicit template instantiations are
+ used.
+
+ We still have a lots of link errors that needs fixing in TAO.
Fri Apr 25 07:06:21 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/PortableServer/PortableServerC.i: Added #if
- (TAO_HAS_MINIMUM_POA == 0) guards in a few places to get the
- file compiling cleanly in minimum builds.
+ * tao/PortableServer/PortableServerC.i: Added #if
+ (TAO_HAS_MINIMUM_POA == 0) guards in a few places to get the
+ file compiling cleanly in minimum builds.
Fri Apr 25 06:27:06 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/PortableServer/ObjectReferenceTemplate.cpp: Fixed a compile
- error in builds with no exceptions.
+ * tao/PortableServer/ObjectReferenceTemplate.cpp: Fixed a compile
+ error in builds with no exceptions.
Thu Apr 24 22:01:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/CONV_FRAMEC.cpp:
- * tao/CurrentC.cpp:
- * tao/DomainC.cpp:
- * tao/DynamicC.cpp:
- * tao/Dynamic_Adapter.cpp:
- * tao/Dynamic_Adapter.h:
- * tao/GIOPC.cpp:
- * tao/IIOPC.cpp:
- * tao/IOP_CodecC.cpp:
- * tao/Messaging_PolicyValueC.cpp:
- * tao/ORB.cpp:
- * tao/Object.cpp:
- * tao/ObjectIdListC.cpp:
- * tao/ObjectReferenceTemplateC.cpp:
- * tao/Object_KeyC.cpp:
- * tao/Objref_VarOut_T.cpp:
- * tao/OctetSeqC.cpp:
- * tao/PolicyC.cpp:
- * tao/Policy_ForwardC.cpp:
- * tao/PortableInterceptorC.cpp:
- * tao/Pseudo_Value_VarOut_T.inl:
- * tao/Pseudo_VarOut_T.inl:
- * tao/ServicesC.cpp:
- * tao/StringSeqC.cpp:
- * tao/TAOC.cpp:
- * tao/TimeBaseC.cpp:
- * tao/ValueBase.cpp:
- * tao/ValueBase.h:
- * tao/ValueFactory.cpp:
- * tao/ValueFactory.h:
- * tao/VarOut_T.cpp:
- * tao/DynamicAny/DynamicAnyC.cpp:
- * tao/DynamicInterface/Request.cpp:
- * tao/IFR_Client/IFR_BaseC.cpp:
- * tao/IORManipulation/IORC.cpp:
- * tao/Messaging/MessagingC.cpp:
- * tao/Messaging/Messaging_No_ImplC.cpp:
- * tao/Messaging/Messaging_RT_PolicyC.cpp:
- * tao/Messaging/Messaging_SyncScope_PolicyC.cpp:
- * tao/Messaging/TAO_ExtC.cpp:
- * tao/PortableServer/Default_ORTC.cpp:
- * tao/PortableServer/ImR_LocatorC.cpp:
- * tao/PortableServer/ImplRepoC.cpp:
- * tao/PortableServer/PortableServerC.cpp:
- * tao/RTCORBA/RTCORBAC.cpp:
- * tao/RTCORBA/RTCORBAC.h:
- * tao/RTCORBA/RTCORBAC.i:
- * tao/RTPortableServer/RTPortableServerC.cpp:
- * tao/TypeCodeFactory/TypeCodeFactoryC.cpp: First set of fixes for
- explicit template instantiation problems. The fixes are not
- complete since the instantiations generated by the IDL compiler
- for the generated code is busted. Fixes to the IDL compiler over
- the past couple of days havent helped the situation. This set of
- fixes addresses
-
- - compilation issues arising in TAO and associated libraries
- from the explicit template instantiations section.
- - link errors while trying to link with TAO library.
-
- Applications linking to libraries other than TAO would still
- experience linking errors. They will be fixed along with the IDL
- compiler in the next couple of days.
+ * tao/CONV_FRAMEC.cpp:
+ * tao/CurrentC.cpp:
+ * tao/DomainC.cpp:
+ * tao/DynamicC.cpp:
+ * tao/Dynamic_Adapter.cpp:
+ * tao/Dynamic_Adapter.h:
+ * tao/GIOPC.cpp:
+ * tao/IIOPC.cpp:
+ * tao/IOP_CodecC.cpp:
+ * tao/Messaging_PolicyValueC.cpp:
+ * tao/ORB.cpp:
+ * tao/Object.cpp:
+ * tao/ObjectIdListC.cpp:
+ * tao/ObjectReferenceTemplateC.cpp:
+ * tao/Object_KeyC.cpp:
+ * tao/Objref_VarOut_T.cpp:
+ * tao/OctetSeqC.cpp:
+ * tao/PolicyC.cpp:
+ * tao/Policy_ForwardC.cpp:
+ * tao/PortableInterceptorC.cpp:
+ * tao/Pseudo_Value_VarOut_T.inl:
+ * tao/Pseudo_VarOut_T.inl:
+ * tao/ServicesC.cpp:
+ * tao/StringSeqC.cpp:
+ * tao/TAOC.cpp:
+ * tao/TimeBaseC.cpp:
+ * tao/ValueBase.cpp:
+ * tao/ValueBase.h:
+ * tao/ValueFactory.cpp:
+ * tao/ValueFactory.h:
+ * tao/VarOut_T.cpp:
+ * tao/DynamicAny/DynamicAnyC.cpp:
+ * tao/DynamicInterface/Request.cpp:
+ * tao/IFR_Client/IFR_BaseC.cpp:
+ * tao/IORManipulation/IORC.cpp:
+ * tao/Messaging/MessagingC.cpp:
+ * tao/Messaging/Messaging_No_ImplC.cpp:
+ * tao/Messaging/Messaging_RT_PolicyC.cpp:
+ * tao/Messaging/Messaging_SyncScope_PolicyC.cpp:
+ * tao/Messaging/TAO_ExtC.cpp:
+ * tao/PortableServer/Default_ORTC.cpp:
+ * tao/PortableServer/ImR_LocatorC.cpp:
+ * tao/PortableServer/ImplRepoC.cpp:
+ * tao/PortableServer/PortableServerC.cpp:
+ * tao/RTCORBA/RTCORBAC.cpp:
+ * tao/RTCORBA/RTCORBAC.h:
+ * tao/RTCORBA/RTCORBAC.i:
+ * tao/RTPortableServer/RTPortableServerC.cpp:
+ * tao/TypeCodeFactory/TypeCodeFactoryC.cpp: First set of fixes for
+ explicit template instantiation problems. The fixes are not
+ complete since the instantiations generated by the IDL compiler
+ for the generated code is busted. Fixes to the IDL compiler over
+ the past couple of days havent helped the situation. This set of
+ fixes addresses
+
+ - compilation issues arising in TAO and associated libraries
+ from the explicit template instantiations section.
+ - link errors while trying to link with TAO library.
+
+ Applications linking to libraries other than TAO would still
+ experience linking errors. They will be fixed along with the IDL
+ compiler in the next couple of days.
Thu Apr 24 19:39:36 2003 Irfan Pyarali <irfan@oomworks.com>
- * tao/PortableServer/POA:
+ * tao/PortableServer/POA:
- The following changes are primarily to fix the problems caused
- by:
+ The following changes are primarily to fix the problems caused
+ by:
- Mon Jan 14 14:41:17 2002 Priyanka Gontla <pgontla@ece.uci.edu>
+ Mon Jan 14 14:41:17 2002 Priyanka Gontla <pgontla@ece.uci.edu>
- These problems include ignoring the <priority> value, running
- extra (and potentially incorrect) code, and memory leaks.
+ These problems include ignoring the <priority> value, running
+ extra (and potentially incorrect) code, and memory leaks.
- - create_reference_i() and create_reference_with_id_i():
- Re-added <priority> parameter and restored function to the way
- it was. However, now we find user id from system id (if
- needed), remember params for potentially invoking
- key_to_object() later, and ask the ORT to create the object.
+ - create_reference_i() and create_reference_with_id_i():
+ Re-added <priority> parameter and restored function to the way
+ it was. However, now we find user id from system id (if
+ needed), remember params for potentially invoking
+ key_to_object() later, and ask the ORT to create the object.
- - servant_to_reference(): Get priority from
- cached_policies_.server_priority() rather than fixing it to
- TAO_INVALID_PRIORITY. Also remember params for potentially
- invoking key_to_object() later, and ask the ORT to create the
- object.
+ - servant_to_reference(): Get priority from
+ cached_policies_.server_priority() rather than fixing it to
+ TAO_INVALID_PRIORITY. Also remember params for potentially
+ invoking key_to_object() later, and ask the ORT to create the
+ object.
- - id_to_reference_i(): Added code so that the ORT is also
- invoked from this method. Not sure why this method was left
- out.
+ - id_to_reference_i(): Added code so that the ORT is also
+ invoked from this method. Not sure why this method was left
+ out.
- - invoke_key_to_object(): Super simplified this method. All
- params required to call create_object_key() and key_to_object()
- are stored away in <key_to_object_params_>.
+ - invoke_key_to_object(): Super simplified this method. All
+ params required to call create_object_key() and key_to_object()
+ are stored away in <key_to_object_params_>.
- * tao/PortableServer/ObjectReferenceTemplate.cpp:
+ * tao/PortableServer/ObjectReferenceTemplate.cpp:
- In make_object(), invoke_key_to_object() no longer requires any
- parameters to be passed to it.
+ In make_object(), invoke_key_to_object() no longer requires any
+ parameters to be passed to it.
- * tao/RTPortableServer/RT_POA.i:
+ * tao/RTPortableServer/RT_POA.i:
- Fixed create_reference_with_priority() and
- create_reference_with_id_and_priority() to pass the priority
- value down to the POA.
+ Fixed create_reference_with_priority() and
+ create_reference_with_id_and_priority() to pass the priority
+ value down to the POA.
Thu Apr 24 13:52:44 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
@@ -505,31 +666,31 @@ Thu Apr 24 10:33:57 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
Thu Apr 24 10:03:48 2003 Venkita Subramonian <venkita@cs.wustl.edu>
- * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+ * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
- Fixed warnings on unused variable. Thanks to Bala for pointing this out.
+ Fixed warnings on unused variable. Thanks to Bala for pointing this out.
Thu Apr 24 08:11:04 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/DynamicInterface/Context.h:
- * tao/DynamicInterface/ExceptionList.h: Added a undef for
- TAO_EXPORT_MACRO and redefined TAO_EXPORT_MACRO. This should fix
- problems with MSVC builds.
+ * tao/DynamicInterface/Context.h:
+ * tao/DynamicInterface/ExceptionList.h: Added a undef for
+ TAO_EXPORT_MACRO and redefined TAO_EXPORT_MACRO. This should fix
+ problems with MSVC builds.
Wed Apr 23 22:12:37 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
- * tao/CDR_Encaps_Codec.cpp (encode_value):
+ * tao/CDR_Encaps_Codec.cpp (encode_value):
- If the internal ACE_Message_Block in the supplied Any is null,
- explicitly create an ACE_Message_Block and populate with the
- marshalled data. Fixes run-time errors in the Codec and
- IORInterceptor tests. Thanks to Jeff for providing a fix.
+ If the internal ACE_Message_Block in the supplied Any is null,
+ explicitly create an ACE_Message_Block and populate with the
+ marshalled data. Fixes run-time errors in the Codec and
+ IORInterceptor tests. Thanks to Jeff for providing a fix.
- * tao/PortableServer/POA.cpp (TAO_POA, create_POA_i):
+ * tao/PortableServer/POA.cpp (TAO_POA, create_POA_i):
- Reverted one more change from fix described in "Wed Apr 23
- 18:06:48 2003 Ossama Othman <ossama@dre.vanderbilt.edu>".
- Fixes a remaining problem in the IORInterceptor test.
+ Reverted one more change from fix described in "Wed Apr 23
+ 18:06:48 2003 Ossama Othman <ossama@dre.vanderbilt.edu>".
+ Fixes a remaining problem in the IORInterceptor test.
Wed Apr 23 18:27:53 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
@@ -550,13 +711,13 @@ Wed Apr 23 18:12:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
Wed Apr 23 18:06:48 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
- * tao/PortableServer/POA.cpp (id_to_reference_i):
- (establish_components):
- * tao/PortableServer/Object_Adapter.cpp (open):
+ * tao/PortableServer/POA.cpp (id_to_reference_i):
+ (establish_components):
+ * tao/PortableServer/Object_Adapter.cpp (open):
- Reverted Carlos' changes that attempted to fix Bug 1414
- (IORInterceptor deadlock). It introduced other problems.
- Thanks to Irfan for detecting this problem.
+ Reverted Carlos' changes that attempted to fix Bug 1414
+ (IORInterceptor deadlock). It introduced other problems.
+ Thanks to Irfan for detecting this problem.
Wed Apr 23 17:13:27 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
@@ -580,13 +741,13 @@ Wed Apr 23 17:05:10 2003 Irfan Pyarali <irfan@oomworks.com>
* tests/Bug_1020_Regression/client.dsp:
* tests/Bug_1020_Regression/server.dsp:
- Reinstated these files. These two tests should compile on VC6
- now that config-win32-msvc-6.h file has been updated and the -GR
- flag has been added to the project files.
+ Reinstated these files. These two tests should compile on VC6
+ now that config-win32-msvc-6.h file has been updated and the -GR
+ flag has been added to the project files.
- * tests\RTCORBA\RTCORBA-test-configurations.xls:
+ * tests\RTCORBA\RTCORBA-test-configurations.xls:
- Updated test configuration details.
+ Updated test configuration details.
Wed Apr 23 15:51:47 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
@@ -598,9 +759,9 @@ Wed Apr 23 15:51:47 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
Wed Apr 23 15:03:48 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>1
- * docs/tutorial/Quoter/AMI/Handler_i.h:
- * docs/tutorial/Quoter/AMI/Handler_i.cpp: Fixed the code to be
- portable by removing _ptr's for non-object references.
+ * docs/tutorial/Quoter/AMI/Handler_i.h:
+ * docs/tutorial/Quoter/AMI/Handler_i.cpp: Fixed the code to be
+ portable by removing _ptr's for non-object references.
Wed Apr 23 09:53:27 2003 Chad Elliott <elliott_c@ociweb.com>
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 9a37e47acf1..cc7a6675925 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -305,7 +305,7 @@ AST_Decl::compute_full_name (void)
}
else
{
- long namelen = 0;
+ size_t namelen = 0;
long first = I_TRUE;
long second = I_FALSE;
char *name = 0;
@@ -390,7 +390,7 @@ AST_Decl::compute_repoID (void)
return;
}
- long namelen = 4; // for the prefix "IDL:"
+ size_t namelen = 4; // for the prefix "IDL:"
long first = I_TRUE;
long second = I_FALSE;
char *name = 0;
@@ -575,7 +575,7 @@ AST_Decl::compute_flat_name (void)
}
else
{
- long namelen = 0;
+ size_t namelen = 0;
long first = I_TRUE;
long second = I_FALSE;
char *item_name = 0;
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index a9014341a49..a4435b36c4b 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -335,17 +335,19 @@ AST_Type::nested_name (const char* local_name,
if (def_next != 0)
{
len_to_match =
- ACE_OS::strlen (def_curr) - ACE_OS::strlen (def_next);
+ ACE_static_cast (int, ACE_OS::strlen (def_curr)) -
+ ACE_static_cast (int, ACE_OS::strlen (def_next));
}
else
{
- len_to_match = ACE_OS::strlen (def_curr);
+ len_to_match = ACE_static_cast (int, ACE_OS::strlen (def_curr));
}
if (use_next != 0)
{
int len =
- ACE_OS::strlen (use_curr) - ACE_OS::strlen (use_next);
+ ACE_static_cast (int, ACE_OS::strlen (use_curr)) -
+ ACE_static_cast (int, ACE_OS::strlen (use_next));
if (len > len_to_match)
{
@@ -354,7 +356,7 @@ AST_Type::nested_name (const char* local_name,
}
else
{
- int len = ACE_OS::strlen (use_curr);
+ int len = ACE_static_cast (int, ACE_OS::strlen (use_curr));
if (len > len_to_match)
{
@@ -391,17 +393,20 @@ AST_Type::nested_name (const char* local_name,
if (def_next != 0)
{
len_to_match =
- ACE_OS::strlen (def_curr) - ACE_OS::strlen (def_next);
+ ACE_static_cast (int, ACE_OS::strlen (def_curr)) -
+ ACE_static_cast (int, ACE_OS::strlen (def_next));
}
else
{
- len_to_match = ACE_OS::strlen (def_curr);
+ len_to_match = ACE_static_cast (int,
+ ACE_OS::strlen (def_curr));
}
if (use_next != 0)
{
int len =
- ACE_OS::strlen (use_curr) - ACE_OS::strlen (use_next);
+ ACE_static_cast (int, ACE_OS::strlen (use_curr)) -
+ ACE_static_cast (int, ACE_OS::strlen (use_next));
if (len > len_to_match)
{
@@ -410,7 +415,7 @@ AST_Type::nested_name (const char* local_name,
}
else
{
- int len = ACE_OS::strlen (use_curr);
+ int len = ACE_static_cast (int, ACE_OS::strlen (use_curr));
if (len > len_to_match)
{
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 60f61b7d43f..522ad02e3b6 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1317,7 +1317,7 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
ACE_OS::sprintf (macro_name, prefix);
- int offset = ACE_OS::strlen (prefix);
+ size_t offset = ACE_OS::strlen (prefix);
// Convert letters in fname to upper case.
for (int i = 0; i < (extension - fname); i++)
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index 1ab6b3782ad..dcc78a32075 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -395,6 +395,32 @@ TAO_OutStream::operator<< (const ACE_CDR::Long num)
return *this;
}
+#if defined (ACE_WIN64)
+TAO_OutStream &
+TAO_OutStream::operator<< (const ACE_CDR::ULongLong num)
+{
+ ACE_OS::fprintf (this->fp_,
+ ACE_UINT64_FORMAT_SPECIFIER,
+ num);
+
+ ACE_OS::fflush (this->fp_);
+
+ return *this;
+}
+
+TAO_OutStream &
+TAO_OutStream::operator<< (const ACE_CDR::LongLong num)
+{
+ ACE_OS::fprintf (this->fp_,
+ ACE_INT64_FORMAT_SPECIFIER,
+ num);
+
+ ACE_OS::fflush (this->fp_);
+
+ return *this;
+}
+#endif /* ACE_WIN64 */
+
TAO_OutStream &
TAO_OutStream::operator<< (const unsigned long num)
{
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 9cd69347bf5..4c663f6d508 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -180,7 +180,7 @@ be_interface::compute_full_skel_name (const char *prefix,
}
else
{
- long namelen = ACE_OS::strlen (prefix);
+ size_t namelen = ACE_OS::strlen (prefix);
long first = I_TRUE;
long second = I_FALSE;
char *item_name = 0;
diff --git a/TAO/TAO_IDL/be/be_interface_strategy.cpp b/TAO/TAO_IDL/be/be_interface_strategy.cpp
index f717ef8830e..cb7b4e1571c 100644
--- a/TAO/TAO_IDL/be/be_interface_strategy.cpp
+++ b/TAO/TAO_IDL/be/be_interface_strategy.cpp
@@ -131,9 +131,9 @@ be_interface_strategy::compute_coll_names (int type,
// prefix and the local name and the (optional) "::"
const char *collocated = collocated_names[type];
- int name_len = ACE_OS::strlen (collocated)
- + ACE_OS::strlen (poa)
- + 1;
+ size_t name_len = ACE_OS::strlen (collocated)
+ + ACE_OS::strlen (poa)
+ + 1;
if (prefix)
{
@@ -211,9 +211,9 @@ be_interface_strategy::compute_coll_names (int type,
// Compute the local name for the collocated class.
char *local_name = this->node_->AST_Interface::local_name ()->get_string ();
- int local_len = ACE_OS::strlen (collocated)
- + ACE_OS::strlen (local_name)
- + 1;
+ size_t local_len = ACE_OS::strlen (collocated)
+ + ACE_OS::strlen (local_name)
+ + 1;
if (prefix)
{
local_len += ACE_OS::strlen (prefix);
@@ -257,7 +257,7 @@ be_interface_strategy::compute_names (const char *name,
return;
}
- int name_length = ACE_OS::strlen (name) +
+ size_t name_length = ACE_OS::strlen (name) +
ACE_OS::strlen (prefix) +
ACE_OS::strlen (suffix);
@@ -268,7 +268,7 @@ be_interface_strategy::compute_names (const char *name,
ACE_OS::strcpy (new_name, name);
const char *interface_name = 0;
- int i = ACE_OS::strlen (name);
+ size_t i = ACE_OS::strlen (name);
for (;i >= 1; i--)
{
@@ -663,7 +663,7 @@ be_interface_default_strategy::full_name (void)
{
if (this->full_name_ == 0)
{
- int len = ACE_OS::strlen (node_->be_decl::full_name ());
+ size_t len = ACE_OS::strlen (node_->be_decl::full_name ());
ACE_NEW_RETURN (this->full_name_,
char[len + 1],
@@ -681,7 +681,7 @@ be_interface_default_strategy::local_name (void)
{
if (!this->local_name_)
{
- int len =
+ size_t len =
ACE_OS::strlen (node_->AST_Interface::local_name ()->get_string ());
ACE_NEW_RETURN (this->local_name_,
@@ -700,7 +700,7 @@ be_interface_default_strategy::flat_name (void)
{
if (!this->flat_name_)
{
- int len = ACE_OS::strlen (node_->be_decl::flat_name ());
+ size_t len = ACE_OS::strlen (node_->be_decl::flat_name ());
ACE_NEW_RETURN (this->flat_name_,
char[len + 1],
@@ -718,7 +718,7 @@ be_interface_default_strategy::repoID (void)
{
if (this->repoID_ == 0)
{
- int len = ACE_OS::strlen (node_->be_decl::repoID ());
+ size_t len = ACE_OS::strlen (node_->be_decl::repoID ());
ACE_NEW_RETURN (this->repoID_,
char[len + 1],
@@ -774,7 +774,7 @@ be_interface_default_strategy::create_with_prefix_suffix (
)
{
char *cat_string = 0;
- unsigned int length =
+ size_t length =
ACE_OS::strlen (str) +
ACE_OS::strlen (prefix) +
ACE_OS::strlen (suffix) +
@@ -821,8 +821,8 @@ be_interface_default_strategy::client_scope (void)
const char *full_name = this->full_name ();
const char *name = this->local_name ();
- int offset = ACE_OS::strlen (name);
- int length = ACE_OS::strlen (full_name) - offset;
+ size_t offset = ACE_OS::strlen (name);
+ size_t length = ACE_OS::strlen (full_name) - offset;
ACE_NEW_RETURN (this->client_scope_,
char[length + 1],
0);
@@ -843,8 +843,8 @@ be_interface_default_strategy::flat_client_scope (void)
const char *full_name = this->flat_name ();
const char *name = this->local_name ();
- int offset = ACE_OS::strlen (name);
- int length = ACE_OS::strlen (full_name) - offset;
+ size_t offset = ACE_OS::strlen (name);
+ size_t length = ACE_OS::strlen (full_name) - offset;
ACE_NEW_RETURN (this->flat_client_scope_,
char[length + 1],
0);
@@ -869,8 +869,8 @@ be_interface_default_strategy::server_scope (void)
const char *name = this->node_->local_coll_name (be_interface::DIRECT);
- int offset = ACE_OS::strlen (name);
- int length = ACE_OS::strlen (full_name) - offset;
+ size_t offset = ACE_OS::strlen (name);
+ size_t length = ACE_OS::strlen (full_name) - offset;
ACE_NEW_RETURN (this->server_scope_,
char[length + 1],
0);
@@ -892,8 +892,8 @@ be_interface_default_strategy::flat_server_scope (void)
const char *full_name = this->flat_name ();
const char *name = this->local_name ();
- int offset = ACE_OS::strlen (name);
- int length = ACE_OS::strlen (full_name) - offset;
+ size_t offset = ACE_OS::strlen (name);
+ size_t length = ACE_OS::strlen (full_name) - offset;
ACE_NEW_RETURN (this->flat_client_scope_,
char[length + 1],
0);
@@ -916,7 +916,7 @@ be_interface_default_strategy::full_base_proxy_impl_name (void)
const char *scope = this->client_scope ();
const char *base_name = this->base_proxy_impl_name ();
- int length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
+ size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
ACE_NEW_RETURN (this->full_base_proxy_impl_name_,
char[length + 1],
0);
@@ -957,7 +957,7 @@ be_interface_default_strategy::full_remote_proxy_impl_name (void)
const char *scope = this->client_scope ();
const char *base_name = this->remote_proxy_impl_name ();
- int length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
+ size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
ACE_NEW_RETURN (this->full_remote_proxy_impl_name_,
char[length + 1],
0);
@@ -995,7 +995,7 @@ be_interface_default_strategy::full_thru_poa_proxy_impl_name (void)
const char *scope = this->server_scope ();
const char *base_name = this->thru_poa_proxy_impl_name ();
- int length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
+ size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
ACE_NEW_RETURN (this->full_thruPOA_proxy_impl_name_,
char[length + 1],
0);
@@ -1036,7 +1036,7 @@ be_interface_default_strategy::full_direct_proxy_impl_name (void)
const char *scope = this->server_scope ();
const char *base_name = this->direct_proxy_impl_name ();
- int length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
+ size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
ACE_NEW_RETURN (this->full_direct_proxy_impl_name_,
char[length + 1],
0);
@@ -1075,7 +1075,7 @@ be_interface_default_strategy::full_base_proxy_broker_name (void)
const char *scope = this->client_scope ();
const char *base_name = this->base_proxy_broker_name ();
- int length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
+ size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
ACE_NEW_RETURN (this->full_base_proxy_broker_name_,
char[length + 1],
0);
@@ -1114,7 +1114,7 @@ be_interface_default_strategy::full_remote_proxy_broker_name (void)
const char *scope = this->client_scope ();
const char *base_name = this->remote_proxy_broker_name ();
- int length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
+ size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
ACE_NEW_RETURN (this->full_remote_proxy_broker_name_,
char[length + 1],
0);
@@ -1153,7 +1153,7 @@ be_interface_default_strategy::full_strategized_proxy_broker_name (void)
const char *scope = this->server_scope ();
const char *base_name = this->strategized_proxy_broker_name ();
- int length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
+ size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name);
ACE_NEW_RETURN (this->full_strategized_proxy_broker_name_,
char[length + 1],
0);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index fb6ed3ae50d..fbe8ee6c270 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -614,7 +614,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
*os << "int" << be_nl
<< node->flat_client_enclosing_scope ()
<< node->base_proxy_broker_name ()
- << "_Factory_Initializer (long)" << be_nl
+ << "_Factory_Initializer (size_t)" << be_nl
<< "{" << be_idt_nl
<< node->flat_client_enclosing_scope ()
<< node->base_proxy_broker_name ()
@@ -634,7 +634,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
<< "_Stub_Factory_Initializer_Scarecrow = " << be_idt_nl
<< node->flat_client_enclosing_scope ()
<< node->base_proxy_broker_name ()
- << "_Factory_Initializer (ACE_reinterpret_cast (long, "
+ << "_Factory_Initializer (ACE_reinterpret_cast (size_t, "
<< node->flat_client_enclosing_scope ()
<< node->base_proxy_broker_name ()
<< "_Factory_Initializer));"
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index 2efdb6bf546..b73c1d84a24 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -3523,12 +3523,13 @@ be_visitor_typecode_defn::repoID_encap_len (be_decl *node)
}
else
{
- ACE_CDR::ULong slen = ACE_OS::strlen (node->repoID ()) + 1;
+ size_t slen = ACE_OS::strlen (node->repoID ()) + 1;
// + 1 for NULL terminating char
// the number of bytes to hold the string must be a multiple of 4 since this
// will be represented as an array of longs
- return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
+ return ACE_static_cast (ACE_CDR::ULong,
+ 4 + 4 * (slen/4 + (slen%4 ? 1:0)));
}
}
@@ -3544,12 +3545,13 @@ be_visitor_typecode_defn::name_encap_len (be_decl *node)
}
else
{
- ACE_CDR::ULong slen =
+ size_t slen =
ACE_OS::strlen (node->original_local_name ()->get_string ()) + 1;
// the number of bytes to hold the string must be a multiple of 4 since this
// will be represented as an array of longs
- return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
+ return ACE_static_cast (ACE_CDR::ULong,
+ 4 + 4 * (slen/4 + (slen%4 ? 1:0)));
}
}
@@ -3561,18 +3563,18 @@ be_visitor_typecode_defn::tc_name2long (const char *name,
{
const int bytes_per_word = sizeof (ACE_CDR::ULong);
static ACE_CDR::ULong buf [NAMEBUFSIZE];
- ACE_CDR::ULong i, slen;
-
- slen = ACE_OS::strlen (name) + 1; // 1 for NULL terminating
+ size_t slen = ACE_OS::strlen (name) + 1; // 1 for NULL terminating
// compute the number of bytes necessary to hold the name rounded to
// the next multiple of 4 (i.e., size of long)
- arrlen = slen / bytes_per_word + (slen % bytes_per_word ? 1 : 0);
+ arrlen = ACE_static_cast (
+ ACE_CDR::ULong,
+ slen / bytes_per_word + (slen % bytes_per_word ? 1 : 0));
ACE_OS::memset (buf, 0, sizeof (buf));
larr = buf;
ACE_OS::memcpy (buf, name, slen);
- for (i = 0; i < arrlen; i++)
+ for (size_t i = 0; i < arrlen; i++)
larr [i] = ACE_HTONL (larr [i]);
return 0;
}
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index 37fe4b20ad7..c98581d6ca1 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -175,6 +175,14 @@ public:
TAO_OutStream &operator<< (const ACE_CDR::Long num);
// output the integer and return a reference to ourselves
+#if defined (ACE_WIN64)
+ TAO_OutStream &operator<< (const ACE_CDR::ULongLong num);
+ // output the integer and return a reference to ourselves
+
+ TAO_OutStream &operator<< (const ACE_CDR::LongLong num);
+ // output the integer and return a reference to ourselves
+#endif /* ACE_WIN64 */
+
TAO_OutStream &operator<< (const unsigned long num);
// output the integer and return a reference to ourselves
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 5348aabc131..4e0f7902fbb 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -1247,9 +1247,9 @@ DRV_parse_args (long ac, char **av)
}
else if (av[i][2] == 'I')
{
- int options = ACE_OS::strlen(av[i]) - 3;
- int j;
- int k = i;
+ size_t options = ACE_OS::strlen(av[i]) - 3;
+ size_t j;
+ size_t k = i;
// optimized typecode support
be_global->gen_impl_files (1);
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 1ee6c7cbbc0..8fc36c6f2dd 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -148,7 +148,7 @@ DRV_get_line (FILE *f)
char *l = fgets (drv_line,
LINEBUF_SIZE,
f);
- long i = 0;
+ size_t i = 0;
if (l == 0)
{
@@ -565,7 +565,7 @@ static char *
DRV_stripped_name (char *fn)
{
char *n = fn;
- long l;
+ size_t l;
if (n == 0)
{
@@ -810,7 +810,7 @@ DRV_pre_proc (const char *myfile)
{
FILE *preproc = ACE_OS::fopen (tmp_file, "r");
char buffer[ACE_MAXLOGMSGLEN];
- int bytes;
+ size_t bytes;
if (preproc == 0)
{
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 4e08250a6e9..1bcccd9977d 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -1002,7 +1002,8 @@ TAO_YY_MALLOC_DECL
TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
result = n; \
} \
- else if ( ((result = fread( buf, 1, max_size, tao_yyin )) == 0) \
+ else if ( ((result = ACE_static_cast (int, \
+ fread( buf, 1, max_size, tao_yyin ))) == 0) \
&& ferror( tao_yyin ) ) \
TAO_YY_FATAL_ERROR( "input in flex scanner failed" );
#endif
@@ -1425,7 +1426,8 @@ TAO_YY_RULE_SETUP
if (!idl_global->preserve_cpp_keywords())
{
entry = cpp_key_tbl.lookup (ace_tao_yytext,
- ACE_OS::strlen (ace_tao_yytext));
+ ACE_static_cast (unsigned int,
+ ACE_OS::strlen (ace_tao_yytext)));
}
if (entry)
tao_yylval.strval = ACE_OS::strdup (entry->mapping_);
diff --git a/TAO/TAO_IDL/include/idl_narrow.h b/TAO/TAO_IDL/include/idl_narrow.h
index 1f4592b8bc4..ac390241577 100644
--- a/TAO/TAO_IDL/include/idl_narrow.h
+++ b/TAO/TAO_IDL/include/idl_narrow.h
@@ -99,7 +99,7 @@ extern char *type_id_to_string(long);
#define DEF_NARROW_METHODS0(TYPE)\
static int type_id(); \
-virtual void *narrow(long type_const)
+virtual void *narrow(size_t type_const)
#define IMPL_NARROW_METHODS0(TYPE)\
@@ -109,9 +109,9 @@ TYPE::type_id()\
return 0;\
}\
void * \
-TYPE::narrow(long type_const) {\
+TYPE::narrow(size_t type_const) {\
void *rval = NULL; \
- long temp = (long) &TYPE::type_id; \
+ size_t temp = (size_t) &TYPE::type_id; \
if (type_const == temp) \
rval = this; \
return rval; \
@@ -119,7 +119,7 @@ TYPE::narrow(long type_const) {\
#define DEF_NARROW_METHODS1(TYPE,PARENT) \
static int type_id(); \
-virtual void *narrow(long type_const)
+virtual void *narrow(size_t type_const)
#define IMPL_NARROW_METHODS1(TYPE,PARENT) \
@@ -129,9 +129,9 @@ TYPE::type_id() \
return 0;\
}\
void * \
-TYPE::narrow(long type_const) {\
+TYPE::narrow(size_t type_const) {\
void *rval = NULL; \
- long temp = (long) &TYPE::type_id; \
+ size_t temp = (size_t) &TYPE::type_id; \
if (type_const == temp) \
rval = this; \
if (rval == NULL) \
@@ -141,7 +141,7 @@ TYPE::narrow(long type_const) {\
#define DEF_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \
static int type_id(); \
-virtual void *narrow(long type_const)
+virtual void *narrow(size_t type_const)
#define IMPL_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \
@@ -151,9 +151,9 @@ TYPE::type_id() \
return 0;\
}\
void * \
-TYPE::narrow(long type_const) { \
+TYPE::narrow(size_t type_const) { \
void *rval = NULL; \
- long temp = (long) &TYPE::type_id; \
+ size_t temp = (size_t) &TYPE::type_id; \
if (type_const == temp) \
rval = this; \
if (rval == NULL) \
@@ -165,7 +165,7 @@ TYPE::narrow(long type_const) { \
#define DEF_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \
static int type_id(); \
-virtual void *narrow(long type_const)
+virtual void *narrow(size_t type_const)
#define IMPL_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \
@@ -175,9 +175,9 @@ TYPE::type_id() \
return 0;\
}\
void * \
-TYPE::narrow(long type_const) {\
+TYPE::narrow(size_t type_const) {\
void *rval = NULL; \
- long temp = (long) &TYPE::type_id; \
+ size_t temp = (size_t) &TYPE::type_id; \
if (type_const == temp) \
rval = this; \
if (rval == NULL) \
@@ -191,7 +191,7 @@ TYPE::narrow(long type_const) {\
#define DEF_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \
static int type_id(); \
-virtual void *narrow(long type_const)
+virtual void *narrow(size_t type_const)
#define IMPL_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \
@@ -201,9 +201,9 @@ TYPE::type_id() \
return 0;\
}\
void * \
-TYPE::narrow(long type_const) {\
+TYPE::narrow(size_t type_const) {\
void *rval = NULL; \
- long temp = (long) &TYPE::type_id; \
+ size_t temp = (size_t) &TYPE::type_id; \
if (type_const == temp) \
rval = this; \
if (rval == NULL) \
@@ -219,7 +219,7 @@ TYPE::narrow(long type_const) {\
#define DEF_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \
static int type_id(); \
-virtual void *narrow(long type_const)
+virtual void *narrow(size_t type_const)
#define IMPL_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \
@@ -229,9 +229,9 @@ TYPE::type_id() \
return 0;\
}\
void * \
-TYPE::narrow(long type_const) {\
+TYPE::narrow(size_t type_const) {\
void *rval = NULL; \
- long temp = (long) &TYPE::type_id; \
+ size_t temp = (size_t) &TYPE::type_id; \
if (type_const == temp) \
rval = this; \
if (rval == NULL) \
@@ -254,7 +254,7 @@ static TYPE *narrow_from_decl(AST_Decl *t)
#define IMPL_NARROW_FROM_DECL(TYPE)\
TYPE * \
TYPE::narrow_from_decl(AST_Decl *t) { \
- return (TYPE *)t->narrow((long)&TYPE::type_id);\
+ return (TYPE *)t->narrow((size_t)&TYPE::type_id);\
}
#define DEF_NARROW_FROM_SCOPE(TYPE)\
@@ -264,7 +264,7 @@ static TYPE *narrow_from_scope(UTL_Scope *t)
#define IMPL_NARROW_FROM_SCOPE(TYPE)\
TYPE * \
TYPE::narrow_from_scope(UTL_Scope *t) { \
- return (TYPE *)t->narrow((long)&TYPE::type_id);\
+ return (TYPE *)t->narrow((size_t)&TYPE::type_id);\
}
#endif // _IDL_NARROW_IDL_NARROW_HH
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index b07cb92ad83..56c7217303f 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -119,7 +119,7 @@ private:
char *c_str;
// Canonicalized string
- unsigned long len;
+ size_t len;
// How long is string.
void canonicalize (void);
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
index 2b23ce2face..e0fcda07d0d 100644
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ b/TAO/TAO_IDL/util/utl_string.cpp
@@ -134,7 +134,7 @@ UTL_String::~UTL_String (void)
void
UTL_String::canonicalize (void)
{
- for (unsigned long i = 0; i < this->len; ++i)
+ for (size_t i = 0; i < this->len; ++i)
{
if (isalpha (this->p_str[i]))
{
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index 12cdb9495fd..42f893f1d35 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -63,7 +63,7 @@ protected:
TAO_Naming_Server my_naming_server_;
// Naming Server instance.
- size_t time_;
+ long time_;
// After how long the server should stop listening to requests (in
// seconds).
};
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index c4b1bc9f7f2..2c7404305ef 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -1630,8 +1630,8 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
int
TAO_MCastConfigIf::in_flowSpec (const AVStreams::flowSpec& flow_spec, const char *flow_name)
{
- int len = strlen (flow_name);
- for (u_int i=0;i<flow_spec.length ();i++)
+ size_t len = ACE_OS::strlen (flow_name);
+ for (CORBA::ULong i = 0; i < flow_spec.length (); i++)
if (ACE_OS::strncmp (flow_spec[i], flow_name, len) == 0)
{
return 1;
@@ -5215,7 +5215,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter)
else
{
substring = new_string.substring (pos);
- pos = new_string.length ();
+ pos = ACE_static_cast (int, new_string.length ());
}
char *token = CORBA::string_dup (substring.c_str ());
result = this->token_array_.set (token, count);
@@ -5265,7 +5265,7 @@ TAO_Tokenizer::token (void)
int
TAO_Tokenizer::num_tokens (void)
{
- return this->num_tokens_;
+ return ACE_static_cast (int, this->num_tokens_);
}
const char *
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 26d9b2cdf74..e9927dedafa 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -364,7 +364,8 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
}
}
- AVStreams::flowSpec new_flowspec (flow_spec_set.size ());
+ AVStreams::flowSpec new_flowspec (ACE_static_cast (CORBA::ULong,
+ flow_spec_set.size ()));
int i=0;
TAO_AV_FlowSpecSetItor connect_end = address_flow_set.end ();
TAO_AV_FlowSpecSetItor connect = address_flow_set.begin ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index 9654e72fd4c..d05613dab19 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -118,7 +118,7 @@ TAO_AV_UDP_MCast_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value
if (i->length () > 0)
{
iov[iovcnt].iov_base = i->rd_ptr ();
- iov[iovcnt].iov_len = i->length ();
+ iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ());
iovcnt++;
// The buffer is full make a OS call. @@ TODO this should
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 2b60a1f33be..a2bb60d052d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -607,7 +607,7 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
if (i->length () > 0)
{
iov[iovcnt].iov_base = i->rd_ptr ();
- iov[iovcnt].iov_len = i->length ();
+ iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ());
iovcnt++;
// The buffer is full make a OS call. @@ TODO this should
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 4569f90079c..072a1b58518 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -47,7 +47,7 @@ int
TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data,
const ACE_Addr &peer_address)
{
- int length = data->length ();
+ int length = ACE_static_cast (int, data->length ());
int more = length;
char *buf_ptr = data->rd_ptr ();
char first_rtcp_packet = 1;
@@ -667,7 +667,8 @@ TAO_AV_RTCP_Callback::send_report (int bye)
sdes.add_item (my_ssrc,
RTCP_SDES_CNAME,
- strlen(this->output_.cname()),
+ ACE_static_cast (unsigned char,
+ ACE_OS::strlen(this->output_.cname())),
this->output_.cname());
if (bye)
{
@@ -782,7 +783,7 @@ TAO_AV_RTCP_Callback::receive_frame (ACE_Message_Block *frame,
{
RTCP_Channel_In *c;
- RTP_Packet packet (frame->rd_ptr(), frame->length());
+ RTP_Packet packet (frame->rd_ptr(), ACE_static_cast (int, frame->length()));
if (this->inputs_.find (packet.ssrc(), c) < 0)
{
@@ -801,7 +802,7 @@ TAO_AV_RTCP_Callback::receive_frame (ACE_Message_Block *frame,
int
TAO_AV_RTCP_Callback::send_frame (ACE_Message_Block *frame)
{
- RTP_Packet packet (frame->rd_ptr(), frame->length());
+ RTP_Packet packet (frame->rd_ptr(), ACE_static_cast (int, frame->length()));
this->output_.updateStatistics (&packet);
return 0;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
index 75731e6e553..9be17255e06 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
@@ -226,7 +226,7 @@ RTCP_Channel_In::recv_rtp_packet(ACE_Message_Block *mb,
ACE_DEBUG ((LM_DEBUG,
"RTCP_Channel_In::recv_rtp_packet - possible loop/collision detected"));
- RTP_Packet data_packet(mb->rd_ptr (), mb->length ());
+ RTP_Packet data_packet(mb->rd_ptr (), ACE_static_cast (int, mb->length ()));
// make sure the packet is valid
if (data_packet.is_valid ())
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 13e0b8432ae..a776fe32f2d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -95,9 +95,9 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(ACE_UINT32 *ssrc_list,
memset(this->reason_, 0, sizeof(this->reason_));
if (text)
{
- int text_length = ACE_OS::strlen(text);
+ size_t text_length = ACE_OS::strlen(text);
memcpy(this->reason_, text, text_length);
- this->reason_length_ = text_length;
+ this->reason_length_ = ACE_static_cast (unsigned char, text_length);
}
else
this->reason_length_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index 809fe8d4a7e..64ba9613e6f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -341,7 +341,8 @@ TAO_AV_RTP_Object::handle_input (void)
// Get payload that has been converted to host byte order
char *data_ptr;
ACE_UINT16 length;
- RTP_Packet rtp_packet(this->frame_.rd_ptr (), this->frame_.length ());
+ RTP_Packet rtp_packet(this->frame_.rd_ptr (),
+ ACE_static_cast (int, this->frame_.length ()));
rtp_packet.get_frame_info (&frame_info);
rtp_packet.get_payload(&data_ptr, length);
@@ -396,7 +397,7 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame,
csrc_count, // csrc count
csrc_list, // csrc list
frame->rd_ptr (), // data
- frame->length ()), // data size
+ (ACE_UINT16)frame->length ()),// data size
-1);
frame_info->sequence_num ++;
@@ -452,7 +453,7 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame,
csrc_count, // csrc count
csrc_list, // csrc list
frame->rd_ptr (), // data
- frame->length ()), // data size
+ (ACE_UINT16)frame->length ()),// data size
-1);
this->sequence_num_ ++;
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index f61bcb22330..7aa78c6e87e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -66,7 +66,7 @@ TAO_AV_TCP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *)
if (i->length () > 0)
{
iov[iovcnt].iov_base = i->rd_ptr ();
- iov[iovcnt].iov_len = i->length ();
+ iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ());
iovcnt++;
// The buffer is full make a OS call. @@ TODO this should
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 4e3b627591b..b424bb97fd8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -219,7 +219,7 @@ TAO_AV_UDP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *)
if (i->length () > 0)
{
iov[iovcnt].iov_base = i->rd_ptr ();
- iov[iovcnt].iov_len = i->length ();
+ iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ());
iovcnt++;
// The buffer is full make a OS call. @@ TODO this should
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index 70307b4f733..787ffcbaa62 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -64,7 +64,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
return;
}
- frame_header_len = output_cdr.total_length ();
+ frame_header_len = ACE_static_cast (u_int, output_cdr.total_length ());
// fill in the default fragment message fields.
fragment.magic_number [0] = 'F';
fragment.magic_number [1] = 'R';
@@ -77,7 +77,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
return;
}
- fragment_len = output_cdr.total_length ();
+ fragment_len = ACE_static_cast (u_int, output_cdr.total_length ());
// fill in the default Start message fields.
start.magic_number [0] = '=';
start.magic_number [1] = 'S';
@@ -93,7 +93,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
return;
}
- start_len = output_cdr.total_length ();
+ start_len = ACE_static_cast (u_int, output_cdr.total_length ());
// fill in the default StartReply message fields.
start_reply.magic_number [0] = '=';
start_reply.magic_number [1] = 'S';
@@ -107,7 +107,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
return;
}
- start_reply_len = output_cdr.total_length ();
+ start_reply_len = ACE_static_cast (u_int, output_cdr.total_length ());
// fill in the default Credit message fields.
credit.magic_number [0] = '=';
@@ -121,7 +121,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
ACE_ERROR ((LM_ERROR, "TAO_SFP constructor\n"));
return;
}
- credit_len = output_cdr.total_length ();
+ credit_len = ACE_static_cast (u_int, output_cdr.total_length ());
}
int
@@ -283,7 +283,8 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport,
ACE_NEW_RETURN (new_node,
TAO_SFP_Fragment_Node,
0);
- new_node->fragment_info_.frag_sz = data->length ();
+ new_node->fragment_info_.frag_sz = ACE_static_cast (CORBA::ULong,
+ data->length ());
new_node->fragment_info_.frag_number = 0;
if (state.frame_.source_ids.length () > 0)
new_node->fragment_info_.source_id = state.frame_.source_ids [0];
@@ -595,11 +596,12 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport,
TAO_OutputCDR &stream,
ACE_Message_Block *mb)
{
- size_t total_len = stream.total_length ();
+ CORBA::ULong total_len = ACE_static_cast (CORBA::ULong,
+ stream.total_length ());
if (mb != 0)
{
for (ACE_Message_Block *temp = mb;temp != 0;temp = temp->cont ())
- total_len += temp->length ();
+ total_len += ACE_static_cast (CORBA::ULong, temp->length ());
char *buf = (char *) stream.buffer ();
size_t offset = TAO_SFP_MESSAGE_SIZE_OFFSET;
@@ -880,11 +882,11 @@ TAO_SFP_Object::send_frame (ACE_Message_Block *frame,
if (this->current_credit_ != 0)
{
// if we have enough credit then we send.
- int total_length = 0;
+ size_t total_length = 0;
for (ACE_Message_Block *temp = frame;temp != 0;temp = temp->cont ())
total_length += temp->length ();
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"total_length of frame=%d\n",total_length));
- if (ACE_static_cast (u_int, total_length) < (TAO_SFP_MAX_PACKET_SIZE -TAO_SFP_Base::frame_header_len))
+ if (total_length < (TAO_SFP_MAX_PACKET_SIZE -TAO_SFP_Base::frame_header_len))
{
if (frame_info != 0)
{
@@ -946,7 +948,8 @@ TAO_SFP_Object::send_frame (ACE_Message_Block *frame,
return 0;
}
size_t last_len,current_len;
- int message_len = out_stream.total_length ();
+ int message_len = ACE_static_cast (int,
+ out_stream.total_length ());
ACE_Message_Block *mb = frame;
ACE_Message_Block *fragment_mb =
this->get_fragment (mb,
@@ -1047,7 +1050,7 @@ TAO_SFP_Object::get_fragment (ACE_Message_Block *&mb,
size_t &last_mb_current_len)
{
ACE_Message_Block *fragment_mb = 0,*temp_mb = 0;
- int prev_len,last_len = 0;
+ size_t prev_len,last_len = 0;
size_t current_len = 0;
size_t message_len = initial_len;
while (mb != 0)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index 21d3100981f..0e781c19364 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -80,7 +80,7 @@ ACE_ES_Dispatch_Request::make_copy (RtecEventComm::EventSet &dest) const
}
else
{
- dest.length (this->event_set_.size ());
+ dest.length (ACE_static_cast (CORBA::ULong, this->event_set_.size ()));
int c = 0;
for (CORBA::ULong i = 0; i < this->event_set_.size (); ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
index e2091091c6d..1d4542b46cd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
@@ -119,7 +119,7 @@ ACE_ES_Dispatch_Request::number_of_events (void) const
if (this->use_single_event_)
return 1;
else
- return this->event_set_.size ();
+ return ACE_static_cast (CORBA::ULong, this->event_set_.size ());
}
ACE_INLINE RtecScheduler::OS_Priority
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index bae643dcd04..8a83893a38a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -240,7 +240,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
ACE_TRY
{
Index_Set &index_set = (*j).int_id_;
- CORBA::ULong length = index_set.size ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong,
+ index_set.size ());
TAO_OutputCDR cdr;
cdr.write_ulong (length);
@@ -338,7 +339,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr,
b != cdr.end ();
b = b->cont ())
{
- CORBA::ULong l = b->length ();
+ CORBA::ULong l = ACE_static_cast (CORBA::ULong, b->length ());
char* rd_ptr = b->rd_ptr ();
@@ -478,7 +479,7 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr,
cdr.write_octet_array (padding, 4);
iov[0].iov_base = cdr.begin ()->rd_ptr ();
- iov[0].iov_len = cdr.begin ()->length ();
+ iov[0].iov_len = ACE_static_cast (u_long, cdr.begin ()->length ());
ACE_INET_Addr inet_addr (udp_addr.port,
udp_addr.ipaddr);
@@ -527,7 +528,7 @@ TAO_ECG_UDP_Sender::compute_fragment_count (const ACE_Message_Block* begin,
b != end;
b = b->cont ())
{
- CORBA::ULong l = b->length ();
+ CORBA::ULong l = ACE_static_cast (CORBA::ULong, b->length ());
total_length += l;
fragment_size += l;
iovcnt++;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index f9562d11194..fb5333fb463 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -53,7 +53,7 @@ TAO_EC_And_Filter::end (void) const
int
TAO_EC_And_Filter::size (void) const
{
- return this->n_;
+ return ACE_static_cast (CORBA::ULong, this->n_);
}
int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index 913e5ce35ce..a18ada6b040 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -77,7 +77,7 @@ TAO_EC_Conjunction_Filter::end (void) const
int
TAO_EC_Conjunction_Filter::size (void) const
{
- return this->n_;
+ return ACE_static_cast (int, this->n_);
}
int
@@ -163,7 +163,7 @@ TAO_EC_Conjunction_Filter::clear (void)
{
*j = 0;
}
- int b = this->n_ % bits_per_word;
+ int b = ACE_static_cast (int, this->n_ % bits_per_word);
Word last = ~0 << b;
*j = last;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 97b182299fe..11e71c4b0ec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -53,7 +53,7 @@ TAO_EC_Disjunction_Filter::end (void) const
int
TAO_EC_Disjunction_Filter::size (void) const
{
- return this->n_;
+ return ACE_static_cast (int, this->n_);
}
int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 777b034a758..64b40f4e1da 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -157,7 +157,7 @@ TAO_EC_Basic_ObserverStrategy::connected (
ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
ACE_CHECK;
- size = this->observers_.current_size ();
+ size = ACE_static_cast (int, this->observers_.current_size ());
RtecEventChannelAdmin::Observer_var *tmp;
ACE_NEW (tmp, RtecEventChannelAdmin::Observer_var[size]);
copy.reset (tmp);
@@ -199,7 +199,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
ACE_CHECK;
- size = this->observers_.current_size ();
+ size = ACE_static_cast (int, this->observers_.current_size ());
RtecEventChannelAdmin::Observer_var *tmp;
ACE_NEW (tmp, RtecEventChannelAdmin::Observer_var[size]);
copy.reset (tmp);
@@ -241,7 +241,7 @@ TAO_EC_Basic_ObserverStrategy::connected (
ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
ACE_CHECK;
- size = this->observers_.current_size ();
+ size = ACE_static_cast (int, this->observers_.current_size ());
RtecEventChannelAdmin::Observer_var *tmp;
ACE_NEW (tmp, RtecEventChannelAdmin::Observer_var[size]);
copy.reset (tmp);
@@ -283,7 +283,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
ACE_CHECK;
- size = this->observers_.current_size ();
+ size = ACE_static_cast (int, this->observers_.current_size ());
RtecEventChannelAdmin::Observer_var *tmp;
ACE_NEW (tmp, RtecEventChannelAdmin::Observer_var[size]);
copy.reset (tmp);
@@ -320,10 +320,11 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
- dep.length (headers.current_size () + 1);
+ dep.length (ACE_static_cast (CORBA::ULong, headers.current_size () + 1));
dep[0].event.header.type = ACE_ES_DISJUNCTION_DESIGNATOR;
- dep[0].event.header.source = headers.current_size ();
+ dep[0].event.header.source = ACE_static_cast (CORBA::ULong,
+ headers.current_size ());
dep[0].event.header.creation_time = ORBSVCS_Time::zero ();
dep[0].rt_info = 0;
@@ -346,7 +347,8 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- qos.publications.length (headers.current_size ());
+ qos.publications.length (ACE_static_cast (CORBA::ULong,
+ headers.current_size ()));
CORBA::ULong count = 0;
for (HeadersIterator i = headers.begin (); i != headers.end (); ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 96d6cb7843d..90009429004 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -349,10 +349,10 @@ public:
void
dump_event (const RtecEventComm::Event &event)
{
- ACE_DEBUG ((LM_DEBUG, "source_ = %d "
+ ACE_DEBUG ((LM_DEBUG, "source_ = %ld "
"type_ = %d "
"time_ = %u.\n",
- ACE_reinterpret_cast (void*, (int) event.header.source),
+ event.header.source,
event.header.type,
// The divide-by-1 is for ACE_U_LongLong support.
ORBSVCS_Time::to_hrtime (event.header.creation_time) / 1));
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index d0fbf3acda3..247ba9a8f6c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -115,7 +115,7 @@ ACE_INLINE void
operator += (TAO_EC_Event_Array &dest,
const TAO_EC_Event &item)
{
- int length = dest.size ();
+ size_t length = dest.size ();
dest.size (length + 1);
dest[length] = item;
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index a312c4302f1..5292d42e8ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -253,7 +253,7 @@ ACE_RT_Task::open_task (const char* name)
if (tempname == 0)
{
ACE_OS::sprintf (tempbuffer,
- "unnamed task %lx", (long) this);
+ "unnamed task %p", this);
tempname = tempbuffer;
}
@@ -346,7 +346,7 @@ ACE_RT_Task::synch_threads (size_t threads)
// First try real-time scheduling with specified priority.
long flags = THR_BOUND | THR_SCHED_FIFO;
if (this->activate (flags,
- threads - this->thr_count (),
+ (int)(threads - this->thr_count ()),
1, // Force it to spawn more threads
thread_priority) == -1)
{
@@ -354,7 +354,7 @@ ACE_RT_Task::synch_threads (size_t threads)
// the requested priority.
flags = THR_BOUND;
if (this->activate (flags,
- threads - this->thr_count (),
+ (int)(threads - this->thr_count ()),
1, // Force it to spawn more threads
thread_priority) == -1)
{
@@ -385,7 +385,7 @@ ACE_RT_Task::synch_threads (size_t threads)
flags = THR_BOUND;
if (this->activate (flags,
- threads - this->thr_count (),
+ (int)(threads - this->thr_count ()),
1, // Force it to spawn more threads
fallback_priority) == -1)
{
@@ -412,9 +412,9 @@ ACE_RT_Task::synch_threads (size_t threads)
{
// kill_threads has to be off the stack in case the last thread
// deletes this RT_Task.
- int kill_threads = this->thr_count () - threads;
+ size_t kill_threads = this->thr_count () - threads;
- for (int x = kill_threads ; x > 0; x--)
+ for (size_t x = 0; x < kill_threads; ++x)
{
// Create a new shutdown command with a task pointer of 0.
ACE_RT_Task_Shutdown *te = new ACE_RT_Task_Shutdown (0);
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 70fddbfb717..4b61e0e0542 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -122,7 +122,7 @@ ACE_ConsumerQOS_Factory::insert (const RtecEventChannelAdmin::Dependency &subscr
void event_debug (const char* p,
const RtecEventComm::Event& event)
{
- int l = ACE_OS::strlen (p);
+ size_t l = ACE_OS::strlen (p);
ACE_DEBUG ((LM_DEBUG,
"%*.*s - event.source: %d (0x%x)\n"
"%*.*s event.type: %d (0x%x)\n",
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index b74b7ae55b0..682566c54ac 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -222,8 +222,8 @@ TAO_FT_IOGR_Property::set_primary (
cdr << ACE_OutputCDR::from_boolean (val);
// Get the length of the CDR stream
- CORBA::ULong length =
- cdr.total_length ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong,
+ cdr.total_length ());
// Set the length
tagged_components.component_data.length (length);
@@ -271,8 +271,8 @@ TAO_FT_IOGR_Property::encode_properties (
cdr << this->ft_group_tagged_component_.object_group_ref_version;
// Get the length of the CDR stream
- CORBA::ULong length =
- cdr.total_length ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong,
+ cdr.total_length ());
// Set the length
tagged_components.component_data.length (length);
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 7ed1582393d..3a55444d597 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -272,7 +272,7 @@ TAO_FT_Service_Callbacks::request_service_context (
service_list[l].context_id = IOP::FT_REQUEST;
// Make a *copy* of the CDR stream...
- CORBA::ULong length = cdr.total_length ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong, cdr.total_length ());
service_list[l].context_data.length (length);
CORBA::Octet *buf = service_list[l].context_data.get_buffer ();
@@ -314,7 +314,7 @@ TAO_FT_Service_Callbacks::group_version_service_context (
service_list[l].context_id = IOP::FT_GROUP_VERSION;
// Make a *copy* of the CDR stream...
- CORBA::ULong length = cdr.total_length ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong, cdr.total_length ());
service_list[l].context_data.length (length);
CORBA::Octet *buf = service_list[l].context_data.get_buffer ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 7680a5c7e96..89c8f3857f0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -283,7 +283,7 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size_t size = path_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ());
CORBA::ExceptionDefSeq *get_ed_seq = 0;
ACE_NEW_THROW_EX (get_ed_seq,
@@ -360,7 +360,7 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size_t size = path_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ());
CORBA::ExceptionDefSeq *put_ed_seq = 0;
ACE_NEW_THROW_EX (put_ed_seq,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 62447f54c98..8b8eacbdd07 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -520,10 +520,10 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
}
}
- size_t size = kind_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
retval->length (size);
- for (size_t j = 0; j < size; ++j)
+ for (CORBA::ULong j = 0; j < size; ++j)
{
CORBA::DefinitionKind next_kind;
kind_queue.dequeue_head (next_kind);
@@ -588,7 +588,7 @@ TAO_Container_i::lookup_name_i (const char *search_name,
exclude_inherited
ACE_ENV_ARG_PARAMETER);
- size_t size = kind_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
CORBA::ContainedSeq *holder;
ACE_NEW_THROW_EX (holder,
@@ -599,7 +599,7 @@ TAO_Container_i::lookup_name_i (const char *search_name,
CORBA::ContainedSeq_var retval = holder;
retval->length (size);
- for (size_t i = 0; i < size; ++i)
+ for (CORBA::ULong i = 0; i < size; ++i)
{
CORBA::DefinitionKind next_kind;
kind_queue.dequeue_head (next_kind);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 0ad6e5f3977..c0c3a03fe3d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -224,7 +224,7 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size_t size = kind_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
CORBA::StructMemberSeq *members = 0;
ACE_NEW_THROW_EX (members,
@@ -243,7 +243,7 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_Configuration_Section_Key member_key;
TAO_IDLType_i *impl = 0;
- for (size_t k = 0; k < size; ++k)
+ for (CORBA::ULong k = 0; k < size; ++k)
{
name_queue.dequeue_head (name);
retval[k].name = name.c_str ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index de821058413..c7b190094a2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -547,7 +547,7 @@ CORBA__TAO_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_IRObject_Proxy_Broker_Factory_function;
@@ -556,7 +556,7 @@ CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -2960,7 +2960,7 @@ CORBA__TAO_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_Contained_Proxy_Broker_Factory_function;
@@ -2969,7 +2969,7 @@ CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -8616,7 +8616,7 @@ CORBA__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_Container_Proxy_Broker_Factory_function;
@@ -8625,7 +8625,7 @@ CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Container_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_Container_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -12972,7 +12972,7 @@ CORBA__TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_IDLType_Proxy_Broker_Factory_function;
@@ -12981,7 +12981,7 @@ CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -13666,7 +13666,7 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function;
@@ -13675,7 +13675,7 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index 2a8515a73be..86850a1e6f4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -1580,7 +1580,7 @@ CORBA__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_Repository_Proxy_Broker_Factory_function;
@@ -1589,7 +1589,7 @@ CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -3600,7 +3600,7 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function;
@@ -3609,7 +3609,7 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -4860,7 +4860,7 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function;
@@ -4869,7 +4869,7 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -6546,7 +6546,7 @@ CORBA__TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_StructDef_Proxy_Broker_Factory_function;
@@ -6555,7 +6555,7 @@ CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -8189,7 +8189,7 @@ CORBA__TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_UnionDef_Proxy_Broker_Factory_function;
@@ -8198,7 +8198,7 @@ CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -9888,7 +9888,7 @@ CORBA__TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_EnumDef_Proxy_Broker_Factory_function;
@@ -9897,7 +9897,7 @@ CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -11070,7 +11070,7 @@ CORBA__TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_AliasDef_Proxy_Broker_Factory_function;
@@ -11079,7 +11079,7 @@ CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -11967,7 +11967,7 @@ CORBA__TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_NativeDef_Proxy_Broker_Factory_function;
@@ -11976,7 +11976,7 @@ CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -12639,7 +12639,7 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function;
@@ -12648,7 +12648,7 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -13616,7 +13616,7 @@ CORBA__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_StringDef_Proxy_Broker_Factory_function;
@@ -13625,7 +13625,7 @@ CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -14763,7 +14763,7 @@ CORBA__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_WstringDef_Proxy_Broker_Factory_function;
@@ -14772,7 +14772,7 @@ CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -16338,7 +16338,7 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function;
@@ -16347,7 +16347,7 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -18419,7 +18419,7 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function;
@@ -18428,7 +18428,7 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -20246,7 +20246,7 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function;
@@ -20255,7 +20255,7 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -22012,7 +22012,7 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function;
@@ -22021,7 +22021,7 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -24109,7 +24109,7 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function;
@@ -24118,7 +24118,7 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ExtAttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -27121,7 +27121,7 @@ CORBA__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_OperationDef_Proxy_Broker_Factory_function;
@@ -27130,7 +27130,7 @@ CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -30517,7 +30517,7 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function;
@@ -30526,7 +30526,7 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -32522,7 +32522,7 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function (CORBA::Object_p
}
int
-CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function;
@@ -32531,7 +32531,7 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -33462,7 +33462,7 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function;
@@ -33471,7 +33471,7 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -34070,7 +34070,7 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr
}
int
-CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function;
@@ -34079,7 +34079,7 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -34669,7 +34669,7 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_
}
int
-CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function;
@@ -34678,7 +34678,7 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -35288,7 +35288,7 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr ob
}
int
-CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function;
@@ -35297,7 +35297,7 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -35887,7 +35887,7 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr
}
int
-CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function;
@@ -35896,7 +35896,7 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 268522e52fd..89839c53fae 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -354,7 +354,7 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr
}
int
-CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function;
@@ -363,7 +363,7 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -1517,7 +1517,7 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_pt
}
int
-CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function;
@@ -1526,7 +1526,7 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -2746,7 +2746,7 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_pt
}
int
-CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function;
@@ -2755,7 +2755,7 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -3337,7 +3337,7 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_p
}
int
-CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function;
@@ -3346,7 +3346,7 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -4180,7 +4180,7 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_
}
int
-CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function;
@@ -4189,7 +4189,7 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -5624,7 +5624,7 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr
}
int
-CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function;
@@ -5633,7 +5633,7 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -7275,7 +7275,7 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function (CORBA::Object
}
int
-CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function;
@@ -7284,7 +7284,7 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -8331,7 +8331,7 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr
}
int
-CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function;
@@ -8340,7 +8340,7 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -8881,7 +8881,7 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object
}
int
-CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function;
@@ -8890,7 +8890,7 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -9431,7 +9431,7 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_
}
int
-CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function;
@@ -9440,7 +9440,7 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -11484,7 +11484,7 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object
}
int
-CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function;
@@ -11493,7 +11493,7 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -13843,7 +13843,7 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_p
}
int
-CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function;
@@ -13852,7 +13852,7 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -14454,7 +14454,7 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_pt
}
int
-CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function;
@@ -14463,7 +14463,7 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -16547,7 +16547,7 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr
}
int
-CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (long)
+CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function;
@@ -16556,7 +16556,7 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer));
+ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index ffca049d558..b29da637285 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -866,7 +866,7 @@ CORBA__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_FixedDef_Proxy_Broker_Factory_function;
@@ -875,7 +875,7 @@ CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -2789,7 +2789,7 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
@@ -2798,7 +2798,7 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -7069,7 +7069,7 @@ CORBA__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ValueDef_Proxy_Broker_Factory_function;
@@ -7078,7 +7078,7 @@ CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -11671,7 +11671,7 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function;
@@ -11680,7 +11680,7 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ExtValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -13260,7 +13260,7 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
@@ -13269,7 +13269,7 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 3b4315304e2..6b0918877c7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -212,7 +212,7 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
this->base_interfaces_recursive (kind_queue,
path_queue);
- size_t size = kind_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
CORBA::InterfaceDefSeq *seq = 0;
ACE_NEW_THROW_EX (seq,
@@ -485,7 +485,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size_t size = key_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ());
fifd->operations.length (size);
for (i = 0; i < size; ++i)
@@ -536,7 +536,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size = key_queue.size ();
+ size = ACE_static_cast (CORBA::ULong, key_queue.size ());
fifd->attributes.length (size);
for (i = 0; i < size; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index 2d9afde0773..72b32a3321f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -202,7 +202,7 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size_t size = key_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ());
CORBA::ParDescriptionSeq *pd_seq = 0;
ACE_NEW_THROW_EX (pd_seq,
@@ -426,7 +426,7 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size_t size = context_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, context_queue.size ());
CORBA::ContextIdSeq *ci_seq = 0;
ACE_NEW_THROW_EX (ci_seq,
@@ -536,7 +536,7 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
}
}
- size_t size = path_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ());
CORBA::ExceptionDefSeq *ed_seq = 0;
ACE_NEW_THROW_EX (ed_seq,
@@ -695,7 +695,7 @@ TAO_OperationDef_i::make_description (
}
}
- size_t size = path_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ());
od.exceptions.length (size);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index 9b0d94e1f2c..e6da07a130e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -166,7 +166,7 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size_t size = kind_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
CORBA::StructMemberSeq *members = 0;
ACE_NEW_THROW_EX (members,
@@ -184,7 +184,7 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_Configuration_Section_Key member_key;
TAO_IDLType_i *impl = 0;
- for (size_t k = 0; k < size; ++k)
+ for (CORBA::ULong k = 0; k < size; ++k)
{
name_queue.dequeue_head (name);
retval[k].name = name.c_str ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index 52d5fca4c4d..040441dd883 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -242,7 +242,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
}
}
- size_t size = key_queue.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ());
CORBA::UnionMemberSeq *members = 0;
ACE_NEW_THROW_EX (members,
@@ -258,7 +258,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj;
TAO_IDLType_i *impl = 0;
- for (size_t k = 0; k < size; ++k)
+ for (CORBA::ULong k = 0; k < size; ++k)
{
key_queue.dequeue_head (next_key);
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index cbeef3b69b6..beffffb8432 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -89,7 +89,8 @@ TAO_IOR_Multicast::init (const char *ior,
else
{
actual_mcast_addr =
- CORBA::string_alloc (ACE_OS::strlen (mcast_addr));
+ CORBA::string_alloc (ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen (mcast_addr)));
actual_mcast_addr = mcast_addr;
}
@@ -248,7 +249,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
// Length of ior to be sent.
CORBA::Short data_len =
- ACE_HTONS (ior.length () + 1);
+ ACE_static_cast (CORBA::Short, ACE_HTONS (ior.length () + 1));
// Vector to be sent.
const int cnt = 2;
@@ -260,7 +261,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
// The ior.
iovp[1].iov_base = ACE_const_cast (char*, ior.c_str ());
- iovp[1].iov_len = ior.length () + 1;
+ iovp[1].iov_len = ACE_static_cast (u_long, ior.length () + 1);
ssize_t result = stream.sendv_n (iovp,
cnt);
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 21a3093354a..9c3eb6dd47a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -23,7 +23,7 @@ TAO_LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL)
DsLogAdmin::LogList* list;
// Figure out the length of the list.
- CORBA::ULong len = hash_map_.current_size ();
+ CORBA::ULong len = ACE_static_cast (CORBA::ULong, hash_map_.current_size ());
// Allocate the list of <len> length.
ACE_NEW_THROW_EX (list,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index aedc218e969..2dac4d201f3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -601,7 +601,7 @@ TAO_Log_i::query_i (const char *constraint,
// Create an iterator
TAO_LogRecordStore::LOG_RECORD_HASH_MAP_ITER iter (store);
- CORBA::ULong len = store.current_size ();
+ CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ());
// How many entries?
@@ -756,7 +756,7 @@ TAO_Log_i::match_i (const char *constraint,
// Create an iterator
TAO_LogRecordStore::LOG_RECORD_STORE_ITER iter (store);
- CORBA::ULong len = store.current_size ();
+ CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ());
// How many entries?
// Iterate over and populate the list.
@@ -1263,7 +1263,7 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
// Create an iterator
TAO_LogRecordStore::LOG_RECORD_STORE_ITER iter (store);
- CORBA::ULong len = store.current_size ();
+ CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ());
// How many entries?
// Iterate over and populate the list.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 96b6c886f1c..d2114d416bc 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -445,7 +445,7 @@ TAO_Naming_Context::to_url (const char * addr,
CosNaming::NamingContext::InvalidName))
{
/// Compute how many characters will be required for the URL
- CORBA::ULong no_char =
+ size_t no_char =
TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
@@ -458,7 +458,8 @@ TAO_Naming_Context::to_url (const char * addr,
// Allocate dynamic memory
//
- char *str_url = CORBA::string_alloc (no_char + sizeof (prefix));
+ char *str_url = CORBA::string_alloc (ACE_static_cast (CORBA::ULong,
+ no_char + sizeof (prefix)));
// Copy 'prefix' to the return parameter.
char *dest = ACE_OS::strcpy (str_url , prefix);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 66045c253a8..c263271136c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -147,7 +147,15 @@ TAO_Naming_Server::parse_args (int argc,
int c;
int size, result;
- long address;
+
+ // This is declared this way to avoid warnings from
+ // some compilers that complain about mismatching types
+ // in the sscanf.
+#if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
+ ptr_arith_t address;
+#else
+ long int address;
+#endif /* ACE_SIZEOF_VOID_P */
while ((c = get_opts ()) != -1)
switch (c)
@@ -177,7 +185,11 @@ TAO_Naming_Server::parse_args (int argc,
break;
case 'b':
result = ::sscanf (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()),
+#if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
+ ACE_UINT64_FORMAT_SPECIFIER,
+#else
"%ld",
+#endif /* ACE_SIZEOF_VOID_P */
&address);
if (result == 0 || result == EOF)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 13b842ec099..f932965cb29 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -477,7 +477,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
if (this->context_->current_size () > how_many)
n = how_many;
else
- n = this->context_->current_size ();
+ n = ACE_static_cast (CORBA::ULong, this->context_->current_size ());
// Use hash iterator to populate a BindingList with bindings.
bl->length (n);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 5cf54ccd338..44ae87c8605 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -966,7 +966,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
if (this->context_->current_size () > how_many)
n = how_many;
else
- n = this->context_->current_size ();
+ n = ACE_static_cast (CORBA::ULong, this->context_->current_size ());
// Use the hash map iterator to populate <bl> with bindings.
bl->length (n);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 10c23a9165c..d222ea5c80c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -279,7 +279,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
if (this->context_->current_size () > how_many)
n = how_many;
else
- n = this->context_->current_size ();
+ n = ACE_static_cast (CORBA::ULong, this->context_->current_size ());
// Use the hash map iterator to populate <bl> with bindings.
bl->length (n);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index 1a099203d85..f6121d1ef23 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -272,7 +272,8 @@ TAO_NS_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
CORBA::INTERNAL ());
ACE_CHECK_RETURN (0);
- size_t current_size = this->constraint_expr_list_.current_size ();
+ CORBA::ULong current_size = ACE_static_cast (CORBA::ULong,
+ this->constraint_expr_list_.current_size ());
// Create the list that goes out.
CosNotifyFilter::ConstraintInfoSeq *infoseq_ptr;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index ff3e5ec41eb..d55c3ed787b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -20,7 +20,7 @@ TAO_NS_EventTypeSeq::TAO_NS_EventTypeSeq (const CosNotification::EventTypeSeq& e
void
TAO_NS_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq) const
{
- event_type_seq.length (this->size ());
+ event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ()));
inherited::CONST_ITERATOR iter (*this);
@@ -39,10 +39,10 @@ TAO_NS_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& event_t
if (this->find (special) == 0)
{
- event_type_seq.length (this->size () - 1);
+ event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size () - 1));
}
else
- event_type_seq.length (this->size ());
+ event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ()));
inherited::CONST_ITERATOR iter (*this);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 0a85d4cff3a..f6c983d44dd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -129,7 +129,7 @@ TAO_NS_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyFilter::FilterIDSeq_var list (list_ptr);
- list->length (len);
+ list->length (ACE_static_cast (CORBA::ULong, len));
FILTER_LIST::ITERATOR iter (this->filter_list_);
FILTER_LIST::ENTRY *entry;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
index 06fa1cf9747..9b30fdefd69 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -39,7 +39,8 @@ TAO_NS_PropertySeq::populate (CosNotification::PropertySeq_var& prop_seq)
PROPERTY_MAP::ITERATOR iterator (this->property_map_);
int index = prop_seq->length ();
- prop_seq->length (index + this->property_map_.current_size ());
+ prop_seq->length (ACE_static_cast (CORBA::ULong,
+ index + this->property_map_.current_size ()));
for (PROPERTY_MAP::ENTRY *entry = 0;
iterator.next (entry) != 0;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 794ce2b6f19..25bafb09c8c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -319,7 +319,7 @@ TAO_PG_ObjectGroupManager::locations_of_members (
TAO_PG_MemberInfo_Set & member_infos = group_entry->member_infos;
- locations->length (member_infos.size ());
+ locations->length (ACE_static_cast (CORBA::ULong, member_infos.size ()));
CORBA::ULong loc = 0;
TAO_PG_MemberInfo_Set::iterator end = member_infos.end ();
@@ -351,7 +351,7 @@ TAO_PG_ObjectGroupManager::groups_at_location (
TAO_PG_ObjectGroup_Array * groups;
if (this->location_map_.find (the_location, groups) == 0)
{
- const CORBA::ULong len = groups->size ();
+ CORBA::ULong len = ACE_static_cast (CORBA::ULong, groups->size ());
ogs->length (len);
@@ -591,7 +591,7 @@ TAO_PG_ObjectGroupManager::member_count (
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- return group_entry->member_infos.size ();
+ return ACE_static_cast (CORBA::ULong, group_entry->member_infos.size ());
}
void
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 34024bf2e2c..6ad44c7d171 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -320,7 +320,7 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
if (j < option_count - 1)
end = options.find (option_delimiter, begin);
else
- end = len - begin; // Handle last endpoint differently
+ end = ACE_static_cast (int, len - begin); // Handle last endpoint differently
if (end == begin)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index b885f58753a..5a4b6b64b62 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -133,7 +133,7 @@ protected:
/// The number of host names cached in the hosts_ array (equivalent
/// to the number of endpoints opened by this Acceptor).
- size_t endpoint_count_;
+ CORBA::ULong endpoint_count_;
/**
* The GIOP version for this endpoint
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 26d4563a88d..24fd4a2cf69 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -135,7 +135,7 @@ TAO_UIPMC_Connection_Handler::open (void*)
}
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->udp_socket_.get_handle ());
+ this->transport ()->id ((size_t) this->udp_socket_.get_handle ());
this->using_mcast_ = 0;
return 0;
@@ -155,7 +155,7 @@ TAO_UIPMC_Connection_Handler::open_server (void)
));
}
- this->transport ()->id ((int) this->mcast_socket_.get_handle ());
+ this->transport ()->id ((size_t) this->mcast_socket_.get_handle ());
this->using_mcast_ = 1;
return 0;
@@ -184,7 +184,7 @@ TAO_UIPMC_Connection_Handler::activate (long flags,
// @@ Frank: Not disabled yet...
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
return TAO_UIPMC_SVC_HANDLER::activate (flags,
n_threads,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index bfe1ca61b15..27c6c125e76 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -394,7 +394,7 @@ TAO_UIPMC_Profile::encode_endpoints (void)
return 1;
}
-size_t
+CORBA::ULong
TAO_UIPMC_Profile::endpoint_count (void)
{
return 1;
@@ -405,19 +405,19 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
{
// @@ Frank: Update to pull out GroupID information...
- u_int buflen = (ACE_OS::strlen (::prefix_) +
- 3 /* "loc" */ +
- 1 /* colon separator */ +
- 2 /* double-slash separator */ +
- 1 /* major version */ +
- 1 /* decimal point */ +
- 1 /* minor version */ +
- 1 /* `@' character */ +
- 15 /* dotted decimal IPv4 address */ +
- 1 /* colon separator */ +
- 5 /* port number */);
+ size_t buflen = (ACE_OS::strlen (::prefix_) +
+ 3 /* "loc" */ +
+ 1 /* colon separator */ +
+ 2 /* double-slash separator */ +
+ 1 /* major version */ +
+ 1 /* decimal point */ +
+ 1 /* minor version */ +
+ 1 /* `@' character */ +
+ 15 /* dotted decimal IPv4 address */ +
+ 1 /* colon separator */ +
+ 5 /* port number */);
- char * buf = CORBA::string_alloc (buflen);
+ char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen));
ACE_OS::sprintf (buf,
"corbaloc:%s://1.0@%s:%d",
@@ -591,11 +591,12 @@ TAO_UIPMC_Profile::update_cached_group_component (void)
return;
}
- CORBA::ULong length = out_cdr.total_length ();
+ size_t length = out_cdr.total_length ();
IOP::TaggedComponent tagged_component;
tagged_component.tag = IOP::TAG_GROUP;
- tagged_component.component_data.length (length);
+ tagged_component.component_data.length (ACE_static_cast (CORBA::ULong,
+ length));
CORBA::Octet *buf =
tagged_component.component_data.get_buffer ();
@@ -603,7 +604,7 @@ TAO_UIPMC_Profile::update_cached_group_component (void)
iterator != 0;
iterator = iterator->cont ())
{
- CORBA::ULong i_length = iterator->length ();
+ size_t i_length = iterator->length ();
ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
buf += i_length;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index e4a0df03c22..78fc7f918f8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -83,7 +83,7 @@ public:
virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
- virtual size_t endpoint_count (void);
+ virtual CORBA::ULong endpoint_count (void);
virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
virtual CORBA::ULong hash (CORBA::ULong max
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -133,7 +133,7 @@ protected:
TAO_UIPMC_Endpoint endpoint_;
/// Number of endpoints in the list headed by <endpoint_>.
- size_t count_;
+ CORBA::ULong count_;
private:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index 7645ae8a839..45583776601 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -180,7 +180,7 @@ ACE_Message_Block_Data_Iterator::next_block (size_t max_length,
if (current_iov_len <= max_length)
{
// Return the full data portion.
- block.iov_len = current_iov_len;
+ block.iov_len = ACE_static_cast (u_long, current_iov_len);
block.iov_base = this->iov_[this->iov_index_].iov_base;
// Go to the next block.
@@ -192,7 +192,7 @@ ACE_Message_Block_Data_Iterator::next_block (size_t max_length,
{
// Let the caller use the first part of this
// message block.
- block.iov_len = max_length;
+ block.iov_len = ACE_static_cast (u_long, max_length);
block.iov_base = this->iov_[this->iov_index_].iov_base;
// Break up the block.
@@ -212,7 +212,7 @@ ACE_Message_Block_Data_Iterator::next_block (size_t max_length,
if (this->iov_len_left_ <= max_length)
{
// Return everything that's left in the block.
- block.iov_len = this->iov_len_left_;
+ block.iov_len = ACE_static_cast (u_long, this->iov_len_left_);
block.iov_base = this->iov_ptr_;
// Go to the next block.
@@ -226,7 +226,7 @@ ACE_Message_Block_Data_Iterator::next_block (size_t max_length,
else
{
// Split a little more off the block.
- block.iov_len = this->iov_len_left_;
+ block.iov_len = ACE_static_cast (u_long, this->iov_len_left_);
block.iov_base = this->iov_ptr_;
this->iov_len_left_ -= max_length;
@@ -383,8 +383,9 @@ TAO_UIPMC_Transport::send_i (iovec *iov, int iovcnt,
miop_hdr.write_ulong (num_fragments);
// UniqueId
- this->write_unique_id (miop_hdr, ACE_reinterpret_cast (unsigned long,
- iov));
+ ptr_arith_t unique_id = ACE_reinterpret_cast (ptr_arith_t, iov);
+ this->write_unique_id (miop_hdr,
+ ACE_static_cast (unsigned long, unique_id));
// Send the buffers.
current_fragment = &fragments[0];
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 8a48c6f6fb7..6b76fd89e48 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -106,7 +106,7 @@ TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_RETURN (new_set, TAO_PropertySet, 0);
// Successful, store this in the products sequence and return.
- size_t cur_len = this->propertyset_products_.length ();
+ CORBA::ULong cur_len = this->propertyset_products_.length ();
this->propertyset_products_.length (cur_len + 1);
this->propertyset_products_[cur_len] = new_set;
return new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -136,7 +136,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
ACE_TRY_CHECK;
// Successful, store this in the products sequence.
- size_t products_len = this->propertyset_products_.length ();
+ CORBA::ULong products_len = this->propertyset_products_.length ();
this->propertyset_products_.length (products_len + 1);
this->propertyset_products_[products_len] = new_set;
@@ -188,7 +188,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
ACE_TRY_CHECK;
// Successful, store this in the products sequence.
- size_t products_len = this->propertyset_products_.length ();
+ CORBA::ULong products_len = this->propertyset_products_.length ();
this->propertyset_products_.length (products_len + 1);
this->propertyset_products_[products_len] = new_set;
@@ -222,7 +222,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void)
{
// Release all the new'ed products.
- for (size_t pi = 0;
+ for (CORBA::ULong pi = 0;
pi < this->propertysetdef_products_.length ();
pi++)
delete this->propertysetdef_products_[pi];
@@ -249,7 +249,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_RETURN (new_set, TAO_PropertySetDef, 0);
// Successful, store this in the products sequence and return.
- size_t cur_len = this->propertysetdef_products_.length ();
+ CORBA::ULong cur_len = this->propertysetdef_products_.length ();
this->propertysetdef_products_.length (cur_len + 1);
this->propertysetdef_products_[cur_len] = new_set;
@@ -281,7 +281,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
ACE_TRY_CHECK;
// Successful, store this in the products sequence.
- size_t products_len = this->propertysetdef_products_.length ();
+ CORBA::ULong products_len = this->propertysetdef_products_.length ();
this->propertysetdef_products_.length (products_len + 1);
this->propertysetdef_products_[products_len] = new_set;
@@ -333,7 +333,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
ACE_TRY_CHECK;
// Successful, store this in the products sequence.
- size_t products_len = this->propertysetdef_products_.length ();
+ CORBA::ULong products_len = this->propertysetdef_products_.length ();
this->propertysetdef_products_.length (products_len + 1);
this->propertysetdef_products_[products_len] = new_set;
@@ -387,7 +387,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
this->allowed_property_names_.length (allowed_properties.length ());
// Keep the allowed property names in the sequence..
- for (size_t ni = 0;
+ for (CORBA::ULong ni = 0;
ni < allowed_properties.length ();
ni++)
this->allowed_property_names_[ni] =
@@ -552,7 +552,7 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
// Check in the allowed_property_types sequence.
CORBA::Boolean ret_val = 0;
- for (size_t ti = 0;
+ for (CORBA::ULong ti = 0;
ti < this->allowed_property_types_.length ();
ti++)
{
@@ -589,7 +589,7 @@ TAO_PropertySet::is_property_allowed (const char* property_name)
return 1;
// Check in the allowed_property_names.
- for (size_t ni = 0;
+ for (CORBA::ULong ni = 0;
ni < this->allowed_property_names_.length ();
ni++)
if (ACE_OS::strcmp ((const char *) this->allowed_property_names_[ni],
@@ -613,12 +613,12 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
CosPropertyService::MultipleExceptions))
{
// Get the length.
- size_t sequence_length = nproperties.length ();
+ CORBA::ULong sequence_length = nproperties.length ();
// Define multiple exceptions object.
CosPropertyService::MultipleExceptions multi_ex;
- for (size_t pi = 0; pi < sequence_length; pi++)
+ for (CORBA::ULong pi = 0; pi < sequence_length; pi++)
{
ACE_TRY
{
@@ -630,7 +630,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
}
ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::invalid_property_name;
@@ -639,7 +639,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
}
ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::conflicting_property;
@@ -648,7 +648,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
}
ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::read_only_property;
@@ -657,7 +657,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
}
ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::unsupported_type_code;
@@ -666,7 +666,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
}
ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::unsupported_property;
@@ -694,7 +694,7 @@ CORBA::ULong
TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->hash_table_.current_size ();
+ return ACE_static_cast (CORBA::ULong, this->hash_table_.current_size ());
}
// Returns all of the property names currently defined in the
@@ -714,7 +714,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
ACE_NEW (property_names,
CosPropertyService::PropertyNames);
- size_t num_of_properties =
+ CORBA::ULong num_of_properties =
this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
@@ -739,7 +739,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
COSPROPERTY_HASH_ENTRY *entry_ptr;
COSPROPERTY_HASH_ITERATOR iterator (this->hash_table_);
- for (size_t ni = 0;
+ for (CORBA::ULong ni = 0;
ni < sequence_length;
ni++, iterator.advance ())
if (iterator.next (entry_ptr) != 0)
@@ -756,7 +756,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
ACE_NEW (property_set, TAO_PropertySet);
- for (size_t i = how_many;
+ for (CORBA::ULong i = how_many;
i < num_of_properties;
i++, iterator.advance ())
if (iterator.next (entry_ptr) != 0)
@@ -838,7 +838,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
0);
// Validate the length.
- size_t n = property_names.length ();
+ CORBA::ULong n = property_names.length ();
if (n == 0)
return 0;
@@ -850,7 +850,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
CORBA::Any_ptr any_ptr = 0;
CORBA::Boolean ret_val = 1;
- for (size_t i = 0; i < n; i++)
+ for (CORBA::ULong i = 0; i < n; i++)
{
any_ptr = get_property_value (property_names [i]
ACE_ENV_ARG_PARAMETER);
@@ -894,8 +894,9 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
CosPropertyService::Properties);
// Validate the length.
- size_t num_of_properties =
- hash_table_.current_size ();
+ CORBA::ULong num_of_properties =
+ this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
if (num_of_properties == 0)
return;
@@ -941,7 +942,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
ACE_NEW (prop_set, TAO_PropertySet);
- for (size_t i = sequence_length;
+ for (CORBA::ULong i = sequence_length;
i < num_of_properties;
i++, iterator.advance ())
{
@@ -1025,14 +1026,14 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
CosPropertyService::MultipleExceptions))
{
// Get the length.
- size_t sequence_length = property_names.length ();
+ CORBA::ULong sequence_length = property_names.length ();
// Declare multiple exceptions' object.
CosPropertyService::MultipleExceptions *multi_ex = 0;
ACE_NEW (multi_ex,
CosPropertyService::MultipleExceptions);
- for (size_t pi = 0; pi < sequence_length; pi++)
+ for (CORBA::ULong pi = 0; pi < sequence_length; pi++)
{
ACE_TRY
{
@@ -1044,7 +1045,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
{
// Put this exception in the multiple exception.
- size_t len = multi_ex->exceptions.length ();
+ CORBA::ULong len = multi_ex->exceptions.length ();
multi_ex->exceptions.length (len + 1);
multi_ex->exceptions[len].reason =
CosPropertyService::invalid_property_name;
@@ -1054,7 +1055,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
{
// Put this exception in the multiple exception.
- size_t len = multi_ex->exceptions.length ();
+ CORBA::ULong len = multi_ex->exceptions.length ();
multi_ex->exceptions.length (len + 1);
multi_ex->exceptions[len].reason =
CosPropertyService::property_not_found;
@@ -1064,7 +1065,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
ACE_CATCH (CosPropertyService::FixedProperty, ex)
{
// Put this exception in the multiple exception.
- size_t len = multi_ex->exceptions.length ();
+ CORBA::ULong len = multi_ex->exceptions.length ();
multi_ex->exceptions.length (len + 1);
multi_ex->exceptions[len].reason =
CosPropertyService::fixed_property;
@@ -1169,7 +1170,7 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes
this->allowed_property_names_.length (allowed_property_defs.length ());
// Copy the allowed properties' names to the sequence.
- for (size_t ni = 0; ni < allowed_property_defs.length (); ni++)
+ for (CORBA::ULong ni = 0; ni < allowed_property_defs.length (); ni++)
this->allowed_property_names_[ni] =
allowed_property_defs[ni].property_name;
@@ -1328,13 +1329,13 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
CosPropertyService::MultipleExceptions))
{
// Get the length.
- size_t sequence_length = property_defs.length ();
+ CORBA::ULong sequence_length = property_defs.length ();
// Define multiple exceptions object.
CosPropertyService::MultipleExceptions multi_ex;
// Try defining the propdefs one by one.
- for (size_t i = 0; i < sequence_length; i++)
+ for (CORBA::ULong i = 0; i < sequence_length; i++)
{
ACE_TRY
{
@@ -1347,7 +1348,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
}
ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::invalid_property_name;
@@ -1356,7 +1357,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
}
ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::conflicting_property;
@@ -1365,7 +1366,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
}
ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::read_only_property;
@@ -1374,7 +1375,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
}
ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::unsupported_type_code;
@@ -1383,7 +1384,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
}
ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::unsupported_property;
@@ -1392,7 +1393,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
}
ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
{
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::unsupported_mode;
@@ -1463,7 +1464,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
1);
// Validate the length of names sequence.
- size_t sequence_length = property_names.length ();
+ CORBA::ULong sequence_length = property_names.length ();
if (sequence_length == 0)
return 1;
@@ -1476,7 +1477,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
// Invoking get_property_mode for each name.
CosPropertyService::PropertyModeType mode;
- for (size_t i = 0; i < sequence_length; i++)
+ for (CORBA::ULong i = 0; i < sequence_length; i++)
{
ACE_TRY
{
@@ -1613,13 +1614,13 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
CosPropertyService::MultipleExceptions))
{
// Get the length of the sequence.
- size_t sequence_length = property_modes.length ();
+ CORBA::ULong sequence_length = property_modes.length ();
// Multiple exception variable to keep track of exceptions.
CosPropertyService::MultipleExceptions multi_ex;
// Set modes one by one.
- for (size_t i = 0; i < sequence_length; i++)
+ for (CORBA::ULong i = 0; i < sequence_length; i++)
{
ACE_TRY
{
@@ -1631,7 +1632,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
{
// Put this exception in the multiple exception.
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::property_not_found;
@@ -1641,7 +1642,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
{
// Put this exception in the multiple exception.
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::invalid_property_name;
@@ -1651,7 +1652,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
{
// Put this exception in the multiple exception.
- size_t len = multi_ex.exceptions.length ();
+ CORBA::ULong len = multi_ex.exceptions.length ();
multi_ex.exceptions.length (len + 1);
multi_ex.exceptions[len].reason =
CosPropertyService::unsupported_mode;
@@ -1735,16 +1736,17 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
return 0;
- size_t size = this->iterator_.map ().current_size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong,
+ this->iterator_.map ().current_size ());
- size_t len = 0;
+ CORBA::ULong len = 0;
if (how_many <= size)
len = how_many;
else
len = size;
property_names->length (len);
- for (size_t ni = 0;
+ for (CORBA::ULong ni = 0;
ni < property_names->length ();
ni++, this->iterator_.advance ())
if (this->iterator_.next (entry_ptr) != 0)
@@ -1830,16 +1832,17 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
return 0;
- size_t size = this->iterator_.map ().current_size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong,
+ this->iterator_.map ().current_size ());
- size_t len;
+ CORBA::ULong len;
if (how_many <= size)
len = how_many;
else
len = size;
nproperties->length (len);
- for (size_t ni = 0;
+ for (CORBA::ULong ni = 0;
ni < nproperties->length ();
ni++,
this->iterator_.advance ())
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index d5150aa9612..04e432db797 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -146,7 +146,7 @@ TAO_SSLIOP_Connection_Handler::open (void *)
// Set the id in the transport now that we're active.
// Use C-style cast b/c otherwise we get warnings on lots of
// compilers.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
// @@ Not needed
this->state_changed (TAO_LF_Event::LFS_SUCCESS);
@@ -176,7 +176,7 @@ TAO_SSLIOP_Connection_Handler::activate (long flags,
THR_BOUND));
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
return TAO_SSL_SVC_HANDLER::activate (flags,
n_threads,
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index ac77b6d90ee..f6da5e721a3 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -267,12 +267,14 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
RtecScheduler::Scheduling_Anomaly **anomaly = 0;
const char *anomaly_severity_msg = "NONE";
CORBA::ULong anomaly_index = 0;
+ CORBA::ULong anomaly_set_size =
+ ACE_static_cast (CORBA::ULong, anomaly_set.size ());
if (anomalies.ptr () == 0)
{
anomalies =
- new RtecScheduler::Scheduling_Anomaly_Set (anomaly_set.size ());
+ new RtecScheduler::Scheduling_Anomaly_Set (anomaly_set_size);
}
- anomalies->length (anomaly_set.size ());
+ anomalies->length (anomaly_set_size);
ACE_Unbounded_Set_Iterator<RtecScheduler::Scheduling_Anomaly *>
anomaly_iter (anomaly_set);
for (anomaly_iter.first (), anomaly_index = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index b868cb827bc..5304a8190fd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -289,9 +289,8 @@ ACE_DynScheduler::register_task (RT_Info *rt_info, handle_t &handle)
if (output_level () >= 5)
{
- ACE_OS::printf ("registered task \"%s\" with RT_Info at %lX\n",
- (const char*)(rt_info->entry_point),
- (unsigned long)rt_info);
+ ACE_OS::printf ("registered task \"%s\" with RT_Info at %p\n",
+ (const char*)(rt_info->entry_point), rt_info);
}
}
break;
@@ -710,7 +709,7 @@ ACE_DynScheduler::schedule (
else
{
// save the total number of registered RT_Infos
- tasks (rt_info_entries_.size ());
+ tasks (ACE_static_cast (u_int, rt_info_entries_.size ()));
}
// set up the task entry data structures
@@ -1316,7 +1315,7 @@ ACE_DynScheduler::status_t
ACE_DynScheduler::setup_task_entries (void)
{
// store number of tasks, based on registrations
- tasks (rt_info_entries_.size ());
+ tasks (ACE_static_cast (u_int, rt_info_entries_.size ()));
// bail out if there are no tasks registered
if (tasks () <= 0)
@@ -1724,7 +1723,7 @@ ACE_DynScheduler::schedule_threads (ACE_Unbounded_Set<RtecScheduler::Scheduling_
ACE_DynScheduler::status_t
ACE_DynScheduler::schedule_dispatches (ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set)
{
- dispatch_entry_count_ = dispatch_entries_->size ();
+ dispatch_entry_count_ = ACE_static_cast (u_int, dispatch_entries_->size ());
ACE_NEW_RETURN (ordered_dispatch_entries_,
Dispatch_Entry * [dispatch_entry_count_],
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
index 0aa1b64a9eb..a4550e76f61 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
@@ -177,7 +177,8 @@ Task_Entry::effective_execution_time () const
return ((rt_info_->info_type == RtecScheduler::OPERATION) ||
(rt_info_->info_type == RtecScheduler::REMOTE_DEPENDANT))
- ? worst_case_execution_time * dispatches_.size ()
+ ? ACE_static_cast (u_long,
+ worst_case_execution_time * dispatches_.size ())
: 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 0c8c2325418..7153d0a4d73 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -177,9 +177,9 @@ Scheduler_Generic::register_task (RT_Info *rt_info [],
if (output_level () >= 5)
{
ACE_OS::printf ("registered task \"%s\" with RT_Info starting "
- "at %lX\n",
+ "at %p\n",
(const char*)rt_info[0]->entry_point,
- (long)rt_info[0]);
+ rt_info[0]);
}
}
break;
@@ -231,7 +231,7 @@ Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *>
status_t status = ACE_Scheduler::SUCCEEDED;
// store number of tasks, based on registrations
- tasks (task_entries_.size ());
+ tasks (ACE_static_cast (u_int, task_entries_.size ()));
if (output_level () > 0)
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index af62d1644bb..1e2cb7dda97 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -239,7 +239,7 @@ remove_offer (CosTrading::Offer*& offer)
}
-int
+size_t
TAO_Preference_Interpreter::num_offers (void)
{
return this->offers_.size ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index dc7eb68f282..2a7426cd362 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -129,7 +129,7 @@ public:
int remove_offer (CosTrading::Offer*& offer);
/// Return the number of offers remaining in the ordering.
- int num_offers (void);
+ size_t num_offers (void);
struct Preference_Info
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index f0129139dd3..b0604813a3b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -299,12 +299,13 @@ TAO_Offer_Database<LOCK_TYPE>::
generate_offer_id (const char *service_type_name, CORBA::ULong id)
{
// holds final id string.
- int total_size = 16 + ACE_OS::strlen (service_type_name);
+ size_t total_size = 16 + ACE_OS::strlen (service_type_name);
// hold portions of id string.
- CosTrading::OfferId offer_id = CORBA::string_alloc (total_size);
+ CosTrading::OfferId offer_id =
+ CORBA::string_alloc (ACE_static_cast (CORBA::ULong, total_size));
char* return_value = 0;
- ACE_OS::sprintf (offer_id, "%016u%s", (CORBA::ULong) id, service_type_name);
+ ACE_OS::sprintf (offer_id, "%016u%s", id, service_type_name);
return_value = CORBA::string_dup (offer_id);
delete [] offer_id;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 197fd50905a..a08cc671b42 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -54,7 +54,7 @@ TAO_Query_Only_Offer_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC((CORBA::SystemException,
CosTrading::UnknownMaxLeft))
{
- return this->offers_.size ();
+ return ACE_static_cast (CORBA::ULong, this->offers_.size ());
}
CORBA::Boolean
@@ -65,7 +65,8 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
{
offers = new CosTrading::OfferSeq;
- CORBA::ULong sequence_size = this->offers_.size ();
+ CORBA::ULong sequence_size = ACE_static_cast (CORBA::ULong,
+ this->offers_.size ());
CORBA::ULong offers_in_sequence = (n < sequence_size) ? n : sequence_size;
offers->length (offers_in_sequence);
@@ -237,7 +238,7 @@ TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft))
{
- return this->ids_.size ();
+ return ACE_static_cast (CORBA::ULong, this->ids_.size ());
}
void
@@ -266,9 +267,10 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Calculate the number of Ids to be returned in this.
- int items_left = this->ids_.size(),
- difference = items_left - n,
- returnable_items = (difference >= 0) ? n : items_left;
+ CORBA::ULong items_left = ACE_static_cast (CORBA::ULong,
+ this->ids_.size());
+ int difference = items_left - n;
+ CORBA::ULong returnable_items = (difference >= 0) ? n : items_left;
CORBA::Boolean return_value = (CORBA::Boolean) (difference > 0);
if (returnable_items == 0)
@@ -284,7 +286,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
if (id_buf != 0)
{
// Copy in those ids!
- for (int i = 0; i < returnable_items; i++)
+ for (CORBA::ULong i = 0; i < returnable_items; i++)
{
CosTrading::OfferId offer_id = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index f7cc7ff360d..7c3f5af8b47 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -43,7 +43,7 @@ max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft))
{
- return this->offer_ids_.size ();
+ return ACE_static_cast (CORBA::ULong, this->offer_ids_.size ());
}
template <class MAP_LOCK_TYPE> CORBA::Boolean
@@ -56,7 +56,8 @@ next_n (CORBA::ULong n,
CORBA::ULong ret_offers = 0;
CORBA::ULong max_possible_offers_in_sequence =
- (n < this->offer_ids_.size ()) ? n : this->offer_ids_.size ();
+ (n < this->offer_ids_.size ()) ? n :
+ ACE_static_cast (CORBA::ULong, this->offer_ids_.size ());
ACE_NEW_THROW_EX (offers,
CosTrading::OfferSeq,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index ac4b649d4e5..13de991038c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -194,7 +194,8 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes
ACE_CHECK_RETURN (0);
CORBA::ULong i = 0;
- CORBA::ULong length = this->type_map_.current_size ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong,
+ this->type_map_.current_size ());
CosTrading::ServiceTypeName *types =
CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq::allocbuf (length);
@@ -399,7 +400,8 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct
// Count the total number of properties.
CORBA::ULong num_props = 0;
- CORBA::ULong num_types = service_type_queue.size ();
+ CORBA::ULong num_types = ACE_static_cast (CORBA::ULong,
+ service_type_queue.size ());
TAO_String_Queue::ITERATOR iterator (service_type_queue);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 97285a68b81..997c9e2567d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -76,11 +76,11 @@ TAO_Trader_Base::is_valid_identifier_name (const char* ident)
if (ident == 0)
return return_value;
- int length = ACE_OS::strlen (ident);
+ size_t length = ACE_OS::strlen (ident);
if (length >= 1 && isalpha (ident[0]))
{
return_value = 1;
- for (int i = 0; i < length; i++)
+ for (size_t i = 0; i < length; i++)
{
if (! (isalnum (ident[i]) || ident[i] == '_'))
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 9378c759148..81e1566c9e9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -382,7 +382,7 @@ fill_receptacles (const char* /* type */,
ACE_CHECK_RETURN (0);
CORBA::ULong i = 0;
- CORBA::ULong size = pref_inter.num_offers ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong, pref_inter.num_offers ());
CORBA::ULong offers_in_sequence = (how_many < size) ? how_many : size;
CORBA::ULong offers_in_iterator = size - offers_in_sequence;
@@ -442,8 +442,8 @@ fill_receptacles (const char* /* type */,
}
// Clear the preference intrerpreter of superfluous items.
- CORBA::ULong num_offers = pref_inter.num_offers ();
- for (i = 0; i < num_offers; i++)
+ size_t num_offers = pref_inter.num_offers ();
+ for (size_t j = 0; j < num_offers; j++)
{
CosTrading::Offer* offer = 0;
CosTrading::OfferId offer_id = 0;
@@ -1790,9 +1790,10 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (ACE_ENV_SINGLE_ARG_DECL_NO
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Allocate space for the link names.
- CORBA::ULong size = this->links_.current_size (), i = 0;
+ size_t size = this->links_.current_size ();
+ CORBA::ULong i = 0;
CosTrading::LinkName* link_seq =
- CosTrading::LinkNameSeq::allocbuf (size);
+ CosTrading::LinkNameSeq::allocbuf (ACE_static_cast (CORBA::ULong, size));
// Copy the link names into the buffer.
for (ACE_TYPENAME Links::iterator links_iter (this->links_);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index c4f76622ba7..b93c5aa3e78 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -1214,7 +1214,8 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
CORBA::ULong num_modified = 0,
original_length = this->offer_->properties.length (),
- total_length = this->props_.current_size ();
+ total_length = ACE_static_cast (CORBA::ULong,
+ this->props_.current_size ());
// Scrap the existing property sequence and begin a new one
CosTrading::PropertySeq prop_seq (total_length);
@@ -1405,7 +1406,8 @@ CosTrading::PolicyNameSeq*
TAO_Offer_Filter::limits_applied (void)
{
int i = 0;
- CORBA::ULong size = this->limits_.size ();
+ CORBA::ULong size = ACE_static_cast (CORBA::ULong,
+ this->limits_.size ());
CosTrading::PolicyName* temp =
CosTrading::PolicyNameSeq::allocbuf (size);
@@ -1474,7 +1476,8 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source,
Prop_Queue prop_queue;
CosTrading::PropertySeq& s_props = source->properties;
CosTrading::PropertySeq& d_props = destination.properties;
- CORBA::ULong length = s_props.length (), elem = 0;
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong, s_props.length ()),
+ elem = 0;
destination.reference = CORBA::Object::_duplicate (source->reference.in ());
if (this->policy_ == CosTrading::Lookup::some)
@@ -1496,8 +1499,8 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source,
// Shove the matched properties into the destination property
// sequence.
- length = prop_queue.size ();
- d_props.length (prop_queue.size ());
+ length = ACE_static_cast (CORBA::ULong, prop_queue.size ());
+ d_props.length (length);
for (Prop_Queue::ITERATOR prop_iter (prop_queue);
! prop_iter.done ();
prop_iter.advance (), elem++)
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index b12a57221d6..09d233cdde5 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -70,7 +70,8 @@ TAO_Asynch_Queued_Message::fill_iov (int iovcnt_max,
ACE_UNUSED_ARG (iovcnt_max); // not used if ACE_ASSERT() is empty
iov[iovcnt].iov_base = this->buffer_ + this->offset_;
- iov[iovcnt].iov_len = this->size_ - this->offset_;
+ iov[iovcnt].iov_len = ACE_static_cast (u_long,
+ this->size_ - this->offset_);
iovcnt++;
}
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
index 2308492f8fb..81db628886e 100644
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CDR_Encaps_Codec.cpp
@@ -65,7 +65,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
CORBA::OctetSeq_var safe_octet_seq = octet_seq;
- octet_seq->length (cdr.total_length ());
+ octet_seq->length (ACE_static_cast (CORBA::ULong, cdr.total_length ()));
CORBA::Octet *buf = octet_seq->get_buffer ();
for (const ACE_Message_Block *i = cdr.begin ();
@@ -208,7 +208,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
CORBA::OctetSeq_var safe_octet_seq = octet_seq;
- octet_seq->length (cdr.total_length ());
+ octet_seq->length (ACE_static_cast (CORBA::ULong, cdr.total_length ()));
CORBA::Octet *buf = octet_seq->get_buffer ();
for (const ACE_Message_Block *i = cdr.begin ();
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index ae8759d14ca..06cc0ddf32c 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -116,7 +116,8 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr,
+ 1 // Object key separator
+ 3 // "://"
+ sizeof (def_port) - 1
- + key_string.length ());
+ + ACE_static_cast (CORBA::ULong,
+ key_string.length ()));
// Copy the default <iiop> prefix.
ACE_OS::strcpy (end_point.inout (),
@@ -137,7 +138,8 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr,
+ 1 // Object key separator
+ 3 // "://"
+ sizeof (def_port) - 1
- + key_string.length ());
+ + ACE_static_cast (CORBA::ULong,
+ key_string.length ()));
ACE_CString prot_name = cloc_name_cstring.substring (0,
pos_colon);
@@ -229,7 +231,7 @@ TAO_CORBALOC_Parser::parse_string_assign_helper (
CORBA::ULong length;
while (cloc_name_ptr != 0)
{
- length = ACE_OS::strlen (cloc_name_ptr);
+ length = ACE_static_cast (CORBA::ULong, ACE_OS::strlen (cloc_name_ptr));
// Forms the endpoint and calls the mprofile_helper.
this->assign_key_string (cloc_name_ptr,
key_string,
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index bf4eaf1258c..e2314ddfc3b 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -374,7 +374,9 @@ TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL)
// 32 bit address
if (sizeof (this) == 4)
- id = ACE_reinterpret_cast (unsigned long, this->invocation_);
+ id = ACE_static_cast (CORBA::ULong,
+ ACE_reinterpret_cast (ptr_arith_t,
+ this->invocation_));
// 64 bit address -- bits 8 through 39 (see notes above!)
// In this case, we make sure this object is large enough to safely
@@ -383,13 +385,16 @@ TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL)
else if (sizeof (this) == 8
&& sizeof (*(this->invocation_)) > 256 /* 2 << 8 */)
id =
- (ACE_reinterpret_cast (unsigned long,
- this->invocation_) >> 8) & 0xFFFFFFFFu;
+ (ACE_static_cast (CORBA::ULong,
+ ACE_reinterpret_cast (ptr_arith_t,
+ this->invocation_)) >> 8) & 0xFFFFFFFFu;
// 64 bit address -- lower 32 bits
else if (sizeof (this) == 8)
- id = ACE_reinterpret_cast (unsigned long,
- this->invocation_) & 0xFFFFFFFFu;
+ id = ACE_static_cast (CORBA::ULong,
+ ACE_reinterpret_cast (ptr_arith_t,
+ this->invocation_)) &
+ 0xFFFFFFFFu;
// @@ The following request ID generator prevents the
// PortableInterceptor::ClientRequestInterceptor::send_request()
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 0e23ba62a3b..90db073b321 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -309,7 +309,8 @@ TAO_Codeset_Manager::init_codeset_factories_i (TAO_CodesetFactorySet& factset,
TAO_CodesetFactorySetItor iter = factset.begin ();
CONV_FRAME::CodeSetId ncs = cs_comp.native_code_set;
- cs_comp.conversion_code_sets.length(factset.size());
+ cs_comp.conversion_code_sets.length(ACE_static_cast (CORBA::ULong,
+ factset.size()));
CORBA::ULong index;
for (index=0; iter != end; iter++)
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 60f9b434550..6fd4351e45f 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -296,7 +296,7 @@ TAO_Connection_Handler::handle_input_eh (
// Grab the transport id now and use the cached value for printing
// since the transport could dissappear by the time the thread
// returns.
- int t_id =
+ size_t t_id =
this->transport ()->id ();
@@ -388,7 +388,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler * eh)
return 0;
}
- int id = -1;
+ size_t id = 0;
{
ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 7df5944b374..4dadf27c274 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -439,7 +439,7 @@ CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_DomainManager_Proxy_Broker_Factory_function;
@@ -448,7 +448,7 @@ CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -1295,7 +1295,7 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr o
}
int
-CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function;
@@ -1304,7 +1304,7 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 4516edbbf22..7064c1f291a 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -26,7 +26,8 @@ TAO_DynArray_i::init_common (void)
this->has_components_ = 1;
this->destroyed_ = 0;
this->current_position_ = 0;
- this->component_count_ = this->da_members_.size ();
+ this->component_count_ = ACE_static_cast (CORBA::ULong,
+ this->da_members_.size ());
}
void
@@ -235,7 +236,8 @@ TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
0);
}
- CORBA::ULong length = this->da_members_.size ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong,
+ this->da_members_.size ());
DynamicAny::AnySeq *elements = 0;
ACE_NEW_THROW_EX (elements,
@@ -364,7 +366,8 @@ TAO_DynArray_i::set_elements_as_dyn_any (
ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
}
- CORBA::ULong length = this->da_members_.size ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong,
+ this->da_members_.size ());
if (values.length () != length)
{
@@ -437,7 +440,8 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
TAO_InputCDR cdr (mb,
any._tao_byte_order ());
- CORBA::ULong length = this->da_members_.size ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong,
+ this->da_members_.size ());
CORBA::ULong arg_length = this->get_tc_length (tc.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
@@ -500,9 +504,9 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
TAO_OutputCDR out_cdr;
CORBA::Any_var field_any;
- CORBA::ULong length = this->da_members_.size ();
+ size_t length = this->da_members_.size ();
- for (CORBA::ULong i = 0; i < length; ++i)
+ for (size_t i = 0; i < length; ++i)
{
// Recursive step.
field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 67674cdfb4d..e8c3efbf79f 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -26,7 +26,8 @@ TAO_DynSequence_i::init_common (void)
this->has_components_ = 1;
this->destroyed_ = 0;
this->current_position_ = -1;
- this->component_count_ = this->da_members_.size ();
+ this->component_count_ = ACE_static_cast (CORBA::ULong,
+ this->da_members_.size ());
}
void
@@ -305,7 +306,8 @@ TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
0);
}
- CORBA::ULong length = this->da_members_.size ();
+ CORBA::ULong length = ACE_static_cast (CORBA::ULong,
+ this->da_members_.size ());
DynamicAny::AnySeq *elements;
ACE_NEW_THROW_EX (elements,
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index b633d0c0819..c74c7b6fe7c 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -41,7 +41,8 @@ TAO_DynStruct_i::init_common (void)
this->container_is_destroying_ = 0;
this->has_components_ = 1;
this->destroyed_ = 0;
- this->component_count_ = this->da_members_.size ();
+ this->component_count_ = ACE_static_cast (CORBA::ULong,
+ this->da_members_.size ());
this->current_position_ = this->component_count_ ? 0 : -1;
}
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.inl b/TAO/tao/DynamicInterface/DII_Invocation.inl
index 0ea9c1448a4..c32989bddc1 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.inl
+++ b/TAO/tao/DynamicInterface/DII_Invocation.inl
@@ -31,7 +31,8 @@ TAO_GIOP_DII_Deferred_Invocation::TAO_GIOP_DII_Deferred_Invocation (
)
: TAO_GIOP_Asynch_Invocation (stub,
req->operation (),
- ACE_OS::strlen (req->operation ()),
+ ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen (req->operation ())),
argument_flag,
orb_core,
byte_order)
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 5e7b94ec360..0cec438d8ad 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -148,7 +148,8 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
TAO_GIOP_DII_Invocation call (this->target_->_stubobj (),
this->opname_,
- ACE_OS::strlen (this->opname_),
+ ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen (this->opname_)),
argument_flag,
this->orb_->orb_core (),
this,
@@ -268,7 +269,8 @@ CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
TAO_GIOP_Oneway_Invocation call (this->target_->_stubobj (),
this->opname_,
- ACE_OS::strlen (this->opname_),
+ ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen (this->opname_)),
argument_flag,
this->orb_->orb_core (),
this->byte_order_);
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index f991bbe90b2..8fc8bcb248e 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -223,7 +223,8 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception)
// to the original source of the reply.
this->orb_server_request_.outgoing ().write_octet_array (
ACE_reinterpret_cast (const CORBA::Octet *, raw_exception.fast_rep ()),
- raw_exception.length () + ACE_CDR::MAX_ALIGNMENT
+ ACE_static_cast (CORBA::ULong,
+ raw_exception.length () + ACE_CDR::MAX_ALIGNMENT)
);
// This will prevent the marshaling of any parameters into this reply.
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 8ef7aad212f..25ddb7bfe30 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -971,7 +971,8 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
const char suffix[] = ":1.0";
char * full_id =
CORBA::string_alloc (sizeof prefix
- + ACE_OS_String::strlen (name)
+ + ACE_static_cast (CORBA::ULong,
+ ACE_OS_String::strlen (name))
+ sizeof suffix);
CORBA::String_var safe_full_id = full_id;
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 96768eed919..905df4e1167 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -232,7 +232,8 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
// this particular environment and that isn't handled by the
// networking infrastructure (e.g., IPSEC).
- CORBA::ULong bodylen = total_len - TAO_GIOP_MESSAGE_HEADER_LEN;
+ CORBA::ULong bodylen = ACE_static_cast (CORBA::ULong,
+ total_len - TAO_GIOP_MESSAGE_HEADER_LEN);
#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
*ACE_reinterpret_cast (CORBA::ULong *, buf +
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index e30a083a8dc..36308018552 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -192,7 +192,8 @@ TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
// this particular environment and that isn't handled by the
// networking infrastructure (e.g., IPSEC).
- CORBA::ULong bodylen = total_len - header_len;
+ CORBA::ULong bodylen = ACE_static_cast (CORBA::ULong,
+ total_len - header_len);
#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
*ACE_reinterpret_cast (CORBA::ULong *, buf + offset) = bodylen;
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 3ebf8db8842..f729d70c94c 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -77,7 +77,7 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
delete [] this->addrs_;
- for (size_t i = 0; i < this->endpoint_count_; ++i)
+ for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
CORBA::string_free (this->hosts_[i]);
delete [] this->hosts_;
@@ -118,7 +118,7 @@ TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
return -1;
// Create a profile for each acceptor endpoint.
- for (size_t i = 0; i < this->endpoint_count_; ++i)
+ for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
{
TAO_IIOP_Profile *pfile = 0;
ACE_NEW_RETURN (pfile,
@@ -159,7 +159,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
CORBA::Short priority)
{
- size_t index = 0;
+ CORBA::ULong index = 0;
TAO_Profile *pfile = 0;
TAO_IIOP_Profile *iiop_profile = 0;
@@ -238,7 +238,7 @@ TAO_IIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
if (endp == 0)
return 0;
- for (size_t i = 0; i < this->endpoint_count_; ++i)
+ for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
{
// compare the port and host name. Please do *NOT* optimize
// this code by comparing the IP address instead. That would
@@ -543,7 +543,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
// the same port. This is how a wildcard socket bind() is supposed
// to work.
u_short port = address.get_port_number ();
- for (size_t j = 0; j < this->endpoint_count_; ++j)
+ for (CORBA::ULong j = 0; j < this->endpoint_count_; ++j)
this->addrs_[j].set_port_number (port, 1);
(void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
@@ -553,7 +553,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
if (TAO_debug_level > 5)
{
- for (size_t i = 0; i < this->endpoint_count_; ++i)
+ for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
{
ACE_DEBUG ((LM_DEBUG,
ACE_LIB_TEXT ("\nTAO (%P|%t) IIOP_Acceptor::open_i - ")
@@ -691,9 +691,9 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
// in the list of interfaces to query for a hostname, otherwise
// exclude it from the list.
if (if_cnt == lo_cnt)
- this->endpoint_count_ = if_cnt;
+ this->endpoint_count_ = ACE_static_cast (CORBA::ULong, if_cnt);
else
- this->endpoint_count_ = if_cnt - lo_cnt;
+ this->endpoint_count_ = ACE_static_cast (CORBA::ULong, if_cnt - lo_cnt);
ACE_NEW_RETURN (this->addrs_,
ACE_INET_Addr[this->endpoint_count_],
@@ -857,7 +857,8 @@ TAO_IIOP_Acceptor::parse_options (const char *str)
if (j < option_count - 1)
end = options.find (option_delimiter, begin);
else
- end = len - begin; // Handle last endpoint differently
+ end = ACE_static_cast (CORBA::ULong, len)
+ - begin; // Handle last endpoint differently
if (end == begin)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 266ca9f43ff..cef37ad7dad 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -177,7 +177,7 @@ protected:
/// The number of host names cached in the hosts_ array (equivalent
/// to the number of endpoints opened by this Acceptor).
- size_t endpoint_count_;
+ CORBA::ULong endpoint_count_;
/**
* Override the hostname used in the ORBEndPoint.
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 86b2ef8b3fe..00e341b6079 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -144,7 +144,7 @@ TAO_IIOP_Connection_Handler::open (void*)
// Set the id in the transport now that we're active.
// Use C-style cast b/c otherwise we get warnings on lots of compilers
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
this->state_changed (TAO_LF_Event::LFS_SUCCESS);
@@ -173,7 +173,7 @@ TAO_IIOP_Connection_Handler::activate (long flags,
// Set the id in the transport now that we're active.
// Use C-style cast b/c otherwise we get warnings on lots of compilers
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
return TAO_IIOP_SVC_HANDLER::activate (flags,
n_threads,
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index b23a4e2a85b..8bd9333d8b1 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -263,7 +263,7 @@ TAO_IIOP_Profile::endpoint (void)
return &this->endpoint_;
}
-size_t
+CORBA::ULong
TAO_IIOP_Profile::endpoint_count (void)
{
return this->count_;
@@ -285,21 +285,21 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
TAO::ObjectKey::encode_sequence_to_string (key.inout(),
this->object_key_);
- u_int buflen = (8 /* "corbaloc" */ +
- 1 /* colon separator */ +
- ACE_OS::strlen (::prefix_) +
- 1 /* colon separator */ +
- 1 /* major version */ +
- 1 /* decimal point */ +
- 1 /* minor version */ +
- 1 /* `@' character */ +
- ACE_OS::strlen (this->endpoint_.host ()) +
- 1 /* colon separator */ +
- 5 /* port number */ +
- 1 /* object key separator */ +
- ACE_OS::strlen (key.in ()));
-
- char * buf = CORBA::string_alloc (buflen);
+ size_t buflen = (8 /* "corbaloc" */ +
+ 1 /* colon separator */ +
+ ACE_OS::strlen (::prefix_) +
+ 1 /* colon separator */ +
+ 1 /* major version */ +
+ 1 /* decimal point */ +
+ 1 /* minor version */ +
+ 1 /* `@' character */ +
+ ACE_OS::strlen (this->endpoint_.host ()) +
+ 1 /* colon separator */ +
+ 5 /* port number */ +
+ 1 /* object key separator */ +
+ ACE_OS::strlen (key.in ()));
+
+ char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen));
static const char digits [] = "0123456789";
@@ -359,7 +359,7 @@ TAO_IIOP_Profile::encode_endpoints (void)
endpoints.length (this->count_);
const TAO_IIOP_Endpoint *endpoint = &this->endpoint_;
- for (size_t i = 0;
+ for (CORBA::ULong i = 0;
i < this->count_;
++i)
{
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index e433714c8d0..c3e0d96d538 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -73,7 +73,7 @@ public:
virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
- virtual size_t endpoint_count (void);
+ virtual CORBA::ULong endpoint_count (void);
virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
virtual CORBA::ULong hash (CORBA::ULong max
ACE_ENV_ARG_DECL);
@@ -113,7 +113,7 @@ protected:
TAO_IIOP_Endpoint endpoint_;
/// Number of endpoints in the list headed by <endpoint_>.
- size_t count_;
+ CORBA::ULong count_;
};
#if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index d6dc4f08275..c3008791dd9 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -188,7 +188,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
// with debugging level on we are on a sticky wicket. Hopefully none
// of our users should run TAO with debugging enabled like they did
// in PathFinder
- int t_id = 0;
+ size_t t_id = 0;
if (TAO_debug_level)
t_id = transport->id ();
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index f7ce24aa71f..d9612125191 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -44,7 +44,8 @@ CORBA::LocalObject::_hash (CORBA::ULong maximum
// enough to hold an address to avoid compile-time warnings on some
// 64-bit platforms.
- CORBA::ULong hash = ACE_reinterpret_cast (unsigned long, this);
+ CORBA::ULong hash = ACE_static_cast (CORBA::ULong,
+ ACE_reinterpret_cast (ptr_arith_t, this));
return hash % maximum;
}
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 61d4e7efc13..8bfb0179995 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -220,7 +220,8 @@ TAO_MCAST_Parser::multicast_query (char *&buf,
// The service name string.
iovp[2].iov_base = (char *) service_name;
- iovp[2].iov_len = ACE_OS::strlen (service_name) + 1;
+ iovp[2].iov_len = ACE_static_cast (u_long,
+ ACE_OS::strlen (service_name) + 1);
// Send the multicast.
result = dgram.send (iovp,
@@ -354,14 +355,11 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
if (pos_colon1 == 0)
{
- const char *default_addr = ACE_DEFAULT_MULTICAST_ADDR;
- this->mcast_address_ = CORBA::string_alloc (ACE_OS::strlen (default_addr));
- this->mcast_address_ = default_addr;
-
+ const char *default_addr = ACE_DEFAULT_MULTICAST_ADDR;
+ this->mcast_address_ = default_addr;
}
else
{
- this->mcast_address_ = CORBA::string_alloc (pos_colon1);
this->mcast_address_ =
mcast_name_cstring.substring (0,
pos_colon1).c_str ();
@@ -404,13 +402,10 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
ACE_OS_String::itoa (trial_port, default_port, 10);
- this->mcast_port_ =
- CORBA::string_alloc (ACE_OS::strlen ((const char *) default_port));
this->mcast_port_ = (const char *) default_port;
}
else
{
- this->mcast_port_ = CORBA::string_alloc (pos_colon2);
this->mcast_port_ = mcast_name_cstring.substring (0,
pos_colon2).c_str ();
}
@@ -422,7 +417,6 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
int pos_colon3 = mcast_name_cstring.find (':', 0);
- this->mcast_nic_ = CORBA::string_alloc (pos_colon3);
this->mcast_nic_ =
mcast_name_cstring.substring (0,
pos_colon3).c_str ();
@@ -436,13 +430,11 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
if (pos_colon4 == 0)
{
// And, the default TTL to be 1
- const char *default_ttl = "1";
- this->mcast_ttl_ = CORBA::string_alloc (ACE_OS::strlen (default_ttl));
+ const char *default_ttl = "1";
this->mcast_ttl_ = default_ttl;
}
else
{
- this->mcast_ttl_ = CORBA::string_alloc (pos_colon4);
this->mcast_ttl_ =
mcast_name_cstring.substring (0,
pos_colon4).c_str ();
@@ -452,9 +444,6 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
mcast_name_cstring.length() - pos_colon4);
this->service_name_ =
- CORBA::string_alloc (mcast_name_cstring.length ());
-
- this->service_name_ =
mcast_name_cstring.substring (1,
mcast_name_cstring.length()
-1).c_str ();
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index c20d9a19c09..0c429cc8847 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -280,7 +280,7 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr obj
}
int
-Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (long)
+Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (size_t)
{
Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer =
Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function;
@@ -289,7 +289,7 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (long)
}
static int Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer));
+ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index fc9a8bee1a6..01b272760fa 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -998,13 +998,15 @@ CORBA::ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id
10);
CORBA::String_var port_ptr =
- CORBA::string_alloc (ACE_OS::strlen ((const char *) port_char));
+ CORBA::string_alloc (ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen ((const char *) port_char)));
port_ptr = (const char *) port_char;
CORBA::String_var def_init_ref =
CORBA::string_alloc (sizeof (prefix) +
- ACE_OS::strlen (port_ptr.in ()) +
+ ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen (port_ptr.in ())) +
2);
ACE_OS::strcpy (def_init_ref.inout (), prefix);
@@ -1656,7 +1658,9 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
char *cp;
ACE_ALLOCATOR_RETURN (cp,
CORBA::string_alloc (sizeof ior_prefix
- + 2 * total_len),
+ + 2 *
+ ACE_static_cast (CORBA::ULong,
+ total_len)),
0);
CORBA::String_var string = cp;
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index cfa544dcc1a..e59d0d827b9 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -310,7 +310,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
long snd_sock_size = -1;
// Use TCP_NODELAY.
- size_t nodelay = 1;
+ int nodelay = 1;
// Use dotted decimal addresses
// @@ This option will be treated as a suggestion to each loaded
@@ -971,7 +971,8 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
10);
CORBA::String_var ns_port_ptr =
- CORBA::string_alloc (ACE_OS::strlen ((const char *) ns_port_char));
+ CORBA::string_alloc (ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen ((const char *) ns_port_char)));
ns_port_ptr = (const char *) ns_port_char;
@@ -979,7 +980,8 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
CORBA::String_var def_init_ref =
CORBA::string_alloc (sizeof (prefix) +
- ACE_OS::strlen (ns_port_ptr.in ()) +
+ ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen (ns_port_ptr.in ())) +
2);
ACE_OS::strcpy (def_init_ref.inout (), prefix);
@@ -2217,12 +2219,13 @@ TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ORB::ObjectIdList *tmp = 0;
ACE_NEW_THROW_EX (tmp,
- CORBA::ORB::ObjectIdList (total_size),
+ CORBA::ORB::ObjectIdList (
+ ACE_static_cast (CORBA::ULong, total_size)),
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (0);
CORBA::ORB::ObjectIdList_var list = tmp;
- list->length (total_size);
+ list->length (ACE_static_cast (CORBA::ULong, total_size));
CORBA::ULong index = 0;
// Index for ObjectIdList members.
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 0630a64a26f..7c6e2679ace 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -293,7 +293,8 @@ CORBA::Object::_hash (CORBA::ULong maximum
// of CORBA::ULong since we need to first cast to an integer
// large enough to hold an address to avoid compile-time
// warnings on some 64-bit platforms.
- CORBA::ULong hash = ACE_reinterpret_cast (unsigned long, this);
+ CORBA::ULong hash = ACE_static_cast (CORBA::ULong,
+ ACE_reinterpret_cast (ptr_arith_t, this));
return hash % maximum;
}
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index 663c736f795..db6a03ff5e7 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -1323,7 +1323,7 @@ ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function (CORBA::Obje
}
int
-ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (long)
+ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (size_t)
{
ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer =
ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function;
@@ -1332,7 +1332,7 @@ ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (long)
}
static int ImplementationRepository__TAO_Locator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer));
+ ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index 851b6351c28..133e61ac196 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -542,7 +542,7 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA:
}
int
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long)
+ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (size_t)
{
ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
@@ -551,7 +551,7 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (lon
}
static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer));
+ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -3012,7 +3012,7 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORB
}
int
-ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long)
+ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (size_t)
{
ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
@@ -3021,7 +3021,7 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (l
}
static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer));
+ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
@@ -5815,7 +5815,7 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_fun
}
int
-ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long)
+ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (size_t)
{
ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
@@ -5824,7 +5824,7 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Ini
}
static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer));
+ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index 2400e3405c6..1cae96bc389 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -50,7 +50,7 @@ TAO_Ignore_Original_Key_Adapter::encode (const PortableServer::ObjectId &origina
size_t active_key_size = active_key.size ();
// Resize to accommodate both the original data and the new active key.
- modified_key.length (active_key_size);
+ modified_key.length (ACE_static_cast (CORBA::ULong, active_key_size));
// Copy active key data into user key.
active_key.encode (modified_key.get_buffer ());
@@ -96,7 +96,9 @@ TAO_Preserve_Original_Key_Adapter::encode (const PortableServer::ObjectId &origi
size_t active_key_size = active_key.size ();
// Resize to accommodate both the original data and the new active key.
- modified_key.length (active_key_size + original_key.length ());
+ modified_key.length (ACE_static_cast (CORBA::ULong,
+ active_key_size)
+ + original_key.length ());
// Copy active key data into user key.
active_key.encode (modified_key.get_buffer ());
@@ -129,8 +131,10 @@ TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modif
size_t active_key_size = ACE_Active_Map_Manager_Key::size ();
// Smartly copy all the data; <original_key does not own the data>.
- original_key.replace (modified_key.maximum () - active_key_size,
- modified_key.length () - active_key_size,
+ original_key.replace (ACE_static_cast (CORBA::ULong,
+ modified_key.maximum () - active_key_size),
+ ACE_static_cast (CORBA::ULong,
+ modified_key.length () - active_key_size),
ACE_const_cast (CORBA::Octet *,
modified_key.get_buffer ()) + active_key_size,
0);
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 3438e39cd4b..3c8ec33bc85 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -82,7 +82,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Object_Adapter_Timeprobe_Description,
#endif /* ACE_ENABLE_TIMEPROBES */
/* static */
-size_t TAO_Object_Adapter::transient_poa_name_size_ = 0;
+CORBA::ULong TAO_Object_Adapter::transient_poa_name_size_ = 0;
void
TAO_Object_Adapter::set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
@@ -104,7 +104,8 @@ TAO_Object_Adapter::set_transient_poa_name_size (const TAO_Server_Strategy_Facto
case TAO_ACTIVE_DEMUX:
default:
TAO_Object_Adapter::transient_poa_name_size_ =
- ACE_Active_Map_Manager_Key::size ();
+ ACE_static_cast (CORBA::ULong,
+ ACE_Active_Map_Manager_Key::size ());
break;
}
}
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 959ea87efc3..2cd2e45d382 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -541,7 +541,7 @@ public:
protected:
- static size_t transient_poa_name_size_;
+ static CORBA::ULong transient_poa_name_size_;
static void set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 0bb6dc61183..540c7a822f0 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -869,13 +869,14 @@ TAO_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::POAList_var children;
-
+ CORBA::ULong child_current = ACE_static_cast (CORBA::ULong,
+ this->children_.current_size ());
ACE_NEW_THROW_EX (children,
- PortableServer::POAList (this->children_.current_size ()),
+ PortableServer::POAList (child_current),
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (0);
- children->length (this->children_.current_size ());
+ children->length (child_current);
CORBA::ULong index = 0;
for (CHILDREN::iterator iterator = this->children_.begin ();
@@ -2983,7 +2984,9 @@ TAO_POA::parse_key (const TAO::ObjectKey &key,
else if (is_system_id)
{
// System ids have fixed size.
- poa_name_size = key.length () - starting_at - TAO_Active_Object_Map::system_id_size ();
+ poa_name_size = ACE_static_cast (CORBA::ULong,
+ key.length () - starting_at -
+ TAO_Active_Object_Map::system_id_size ());
}
else
{
@@ -3189,8 +3192,8 @@ TAO_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
void
TAO_POA::set_folded_name (void)
{
- CORBA::ULong length = 0;
- CORBA::ULong parent_length = 0;
+ size_t length = 0;
+ size_t parent_length = 0;
if (this->parent_ != 0)
{
@@ -3201,7 +3204,7 @@ TAO_POA::set_folded_name (void)
length += this->name_.length ();
length += TAO_POA::name_separator_length ();
- this->folded_name_.length (length);
+ this->folded_name_.length (ACE_static_cast (CORBA::ULong, length));
CORBA::Octet *folded_name_buffer = this->folded_name_.get_buffer ();
if (this->parent_ != 0)
@@ -3226,7 +3229,8 @@ TAO_POA::string_to_ObjectId (const char *string)
// We DO NOT include the zero terminator, as this is simply an
// artifact of the way strings are stored in C.
//
- CORBA::ULong buffer_size = ACE_OS::strlen (string);
+ CORBA::ULong buffer_size = ACE_static_cast (CORBA::ULong,
+ ACE_OS::strlen (string));
// Create the buffer for the Id
CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
@@ -3278,7 +3282,7 @@ TAO_POA::wstring_to_ObjectId (const CORBA::WChar *string)
//
CORBA::ULong string_length = ACE_OS::wslen (string);
- size_t buffer_size = string_length * sizeof (CORBA::WChar);
+ CORBA::ULong buffer_size = string_length * sizeof (CORBA::WChar);
// Create the buffer for the Id
CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
@@ -3761,7 +3765,7 @@ TAO_POA::create_stub_object (const TAO::ObjectKey &object_key,
// profiles than there are endpoints. In some cases, there can be
// less profiles than endpoints.
int result =
- mprofile.set (profile_count);
+ mprofile.set (ACE_static_cast (CORBA::ULong, profile_count));
if (result == -1)
error = 1;
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index 060a02f39dc..ecea68f638b 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -107,11 +107,13 @@ TAO_POA_Manager::generate_manager_id (void) const
if (sizeof (this) == 4) // 32 bit address
id =
- ACE_reinterpret_cast (unsigned long, this);
+ ACE_static_cast (PortableInterceptor::AdapterManagerId,
+ ACE_reinterpret_cast (ptr_arith_t, this));
else if (sizeof (this) == 8) // 64 bit address -- use lower 32 bits
id =
- ACE_reinterpret_cast (unsigned long, this) & 0xFFFFFFFFu;
+ ACE_static_cast (PortableInterceptor::AdapterManagerId,
+ ACE_reinterpret_cast (ptr_arith_t, this) & 0xFFFFFFFFu);
// @@ If we ever hit a platform where neither of the above cases are
// satisfied, we're up the creek!
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index e02639fbedd..75f6bf0dc67 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -700,7 +700,7 @@ CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
}
int
-CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (long)
+CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (size_t)
{
CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_Policy_Proxy_Broker_Factory_function;
@@ -709,7 +709,7 @@ CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (long)
}
static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer));
+ CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 32b3f9b5bf1..b29e45af47a 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -202,7 +202,8 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
}
// Fetch the skeleton for this operation
- if (this->_find (opname, skel, req.operation_length()) == -1)
+ if (this->_find (opname, skel,
+ ACE_static_cast (unsigned int, req.operation_length())) == -1)
{
ACE_THROW (CORBA::BAD_OPERATION ());
}
@@ -287,7 +288,8 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req,
}
// Fetch the skeleton for this operation
- if (this->_find (opname, skel, req.operation_length()) == -1)
+ if (this->_find (opname, skel,
+ ACE_static_cast (unsigned int, req.operation_length())) == -1)
{
ACE_THROW (CORBA::BAD_OPERATION ());
}
diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
index e98c343b561..4bb0cc01dec 100644
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
@@ -3,7 +3,8 @@
ACE_INLINE u_long
TAO_Servant_Hash::operator () (PortableServer::Servant servant) const
{
- return u_long (servant);
+ return ACE_static_cast (u_long,
+ ACE_reinterpret_cast (ptr_arith_t, servant));
}
ACE_INLINE TAO_Stub *
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 183191797d3..c9c0b89e82c 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -54,13 +54,14 @@ TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
// 64-bit platforms.
if (sizeof (this) == 4) // 32 bit address
- id =
- ACE_reinterpret_cast (unsigned long, &(this->server_request_));
+ id = ACE_static_cast (CORBA::ULong,
+ ACE_reinterpret_cast (ptr_arith_t,
+ &(this->server_request_)));
else if (sizeof (this) == 8) // 64 bit address -- use lower 32 bits
- id =
- ACE_reinterpret_cast (unsigned long,
- &(this->server_request_)) & 0xFFFFFFFFu;
+ id = ACE_static_cast (CORBA::ULong,
+ ACE_reinterpret_cast (ptr_arith_t,
+ &(this->server_request_)) & 0xFFFFFFFFu);
else
// @@ Rather than fallback on the GIOP request ID, we should use
diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
index 46779d234b7..a8b67ef4cdf 100644
--- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
@@ -101,7 +101,7 @@ TAO_Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (
return the_tao_strategized_object_proxy_broker ();
}
-int _TAO_collocation_Object_Proxy_Broker_Factory_Initializer (long dummy)
+int _TAO_collocation_Object_Proxy_Broker_Factory_Initializer (size_t dummy)
{
ACE_UNUSED_ARG (dummy);
@@ -113,5 +113,5 @@ int _TAO_collocation_Object_Proxy_Broker_Factory_Initializer (long dummy)
static int
_TAO_collocation_Object_Proxy_Broker_Factory_Initializer_Scarecrow =
-_TAO_collocation_Object_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long,
+_TAO_collocation_Object_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t,
_TAO_collocation_Object_Proxy_Broker_Factory_Initializer));
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 3f97980f673..341efa8f02d 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -286,7 +286,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
Messaging::PolicyValue pv;
Messaging::PolicyValueSeq policy_value_seq;
- CORBA::ULong length;
+ size_t length;
CORBA::Octet *buf = 0;
policy_value_seq.length (policy_list->length ());
@@ -294,7 +294,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
// This loop iterates through CORBA::PolicyList to convert
// each CORBA::Policy into a CORBA::PolicyValue
const size_t plen = policy_list->length ();
- for (size_t i = 0; i < plen; ++i)
+ for (CORBA::ULong i = 0; i < plen; ++i)
{
TAO_OutputCDR out_CDR;
policy_value_seq[i].ptype =
@@ -305,7 +305,8 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
(*policy_list)[i]->_tao_encode (out_CDR);
length = out_CDR.total_length ();
- policy_value_seq[i].pvalue.length (length);
+ policy_value_seq[i].pvalue.length (ACE_static_cast (CORBA::ULong,
+ length));
buf = policy_value_seq[i].pvalue.get_buffer ();
@@ -332,14 +333,15 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
length = out_cdr.total_length ();
- tagged_component.component_data.length (length);
+ tagged_component.component_data.length (ACE_static_cast (CORBA::ULong,
+ length));
buf = tagged_component.component_data.get_buffer ();
for (const ACE_Message_Block *iterator = out_cdr.begin ();
iterator != 0;
iterator = iterator->cont ())
{
- CORBA::ULong i_length = iterator->length ();
+ size_t i_length = iterator->length ();
ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
buf += i_length;
@@ -640,7 +642,7 @@ TAO_Unknown_Profile::endpoint (void)
return 0;
}
-size_t
+CORBA::ULong
TAO_Unknown_Profile::endpoint_count (void)
{
return 0;
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index c0daf8729b2..c5cce5ef180 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -209,7 +209,7 @@ public:
virtual TAO_Endpoint *endpoint (void) = 0;
/// Return how many endpoints this profile contains.
- virtual size_t endpoint_count (void) = 0;
+ virtual CORBA::ULong endpoint_count (void) = 0;
/**
* Return true if this profile is equivalent to other_profile. Two
@@ -360,7 +360,7 @@ public:
virtual const TAO::ObjectKey &object_key (void) const;
virtual TAO::ObjectKey *_key (void) const;
virtual TAO_Endpoint *endpoint (void);
- virtual size_t endpoint_count (void);
+ virtual CORBA::ULong endpoint_count (void);
virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
virtual CORBA::ULong hash (CORBA::ULong max
ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index aedc5479886..775e55da40b 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -304,7 +304,9 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
{
TAO_Private_Transport_Descriptor private_desc (
invocation->endpoint (),
- ACE_reinterpret_cast (long, invocation->stub ()));
+ ACE_static_cast (long,
+ ACE_reinterpret_cast (ptr_arith_t,
+ invocation->stub ())));
status =
invocation->perform_call (private_desc
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index e01ab7aa269..b0478b816a3 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -615,7 +615,7 @@ TAO_RT_Protocols_Hooks::set_default_policies (ACE_ENV_SINGLE_ARG_DECL)
TAO_ProtocolFactorySet *pfs = this->orb_core_->protocol_factories ();
RTCORBA::ProtocolList protocols;
- protocols.length (pfs->size ());
+ protocols.length (ACE_static_cast (CORBA::ULong, pfs->size ()));
int i = 0;
for (TAO_ProtocolFactorySetItor factory = pfs->begin ();
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index a60fd1c2a60..20155c36601 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -345,7 +345,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
// profiles than there are endpoints. In some cases, there can be
// less profiles than endpoints.
int result =
- mprofile.set (profile_count);
+ mprofile.set (ACE_static_cast (CORBA::ULong, profile_count));
if (result == -1)
error = 1;
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index b465179d743..2842980d90b 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -19,8 +19,8 @@ TAO_Service_Context::set_context_i (IOP::ServiceId id,
context.context_id = id;
// Make a *copy* of the CDR stream...
- CORBA::ULong length = cdr.total_length ();
- context.context_data.length (length);
+ size_t length = cdr.total_length ();
+ context.context_data.length (ACE_static_cast (CORBA::ULong, length));
CORBA::Octet *buf = context.context_data.get_buffer ();
for (const ACE_Message_Block *i = cdr.begin ();
@@ -40,8 +40,8 @@ TAO_Service_Context::set_context_i (IOP::ServiceContext &context,
TAO_OutputCDR &cdr)
{
// Make a *copy* of the CDR stream...
- CORBA::ULong length = cdr.total_length ();
- context.context_data.length (length);
+ size_t length = cdr.total_length ();
+ context.context_data.length (ACE_static_cast (CORBA::ULong, length));
CORBA::Octet *buf = context.context_data.get_buffer ();
for (const ACE_Message_Block *i = cdr.begin ();
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index f0dd26cd084..741c9e3834a 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -558,9 +558,9 @@ TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
// in the list of interfaces to query for a hostname, otherwise
// exclude it from the list.
if (if_cnt == lo_cnt)
- this->endpoint_count_ = if_cnt;
+ this->endpoint_count_ = ACE_static_cast (CORBA::ULong, if_cnt);
else
- this->endpoint_count_ = if_cnt - lo_cnt;
+ this->endpoint_count_ = ACE_static_cast (CORBA::ULong, if_cnt - lo_cnt);
ACE_NEW_RETURN (this->addrs_,
ACE_INET_Addr[this->endpoint_count_],
@@ -707,7 +707,8 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
if (j < option_count - 1)
end = options.find (option_delimiter, begin);
else
- end = len - begin; // Handle last endpoint differently
+ end = ACE_static_cast (int,
+ len - begin); // Handle last endpoint differently
if (end == begin)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index e933af2019a..c3e296e6e03 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -158,7 +158,7 @@ protected:
/// The number of host names cached in the hosts_ array (equivalent
/// to the number of endpoints opened by this Acceptor).
- size_t endpoint_count_;
+ CORBA::ULong endpoint_count_;
/**
* The GIOP version for this endpoint
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 5dbad7978d5..e29535ba633 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -120,7 +120,7 @@ TAO_DIOP_Connection_Handler::open (void*)
}
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
this->state_changed (TAO_LF_Event::LFS_SUCCESS);
@@ -141,7 +141,7 @@ TAO_DIOP_Connection_Handler::open_server (void)
));
}
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
return 0;
}
@@ -169,7 +169,7 @@ TAO_DIOP_Connection_Handler::activate (long flags,
// @@ Frank: Not disabled yet...
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
return TAO_DIOP_SVC_HANDLER::activate (flags,
n_threads,
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index f76f6d5b772..e99db319aa7 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -273,7 +273,7 @@ TAO_DIOP_Profile::endpoint (void)
return &this->endpoint_;
}
-size_t
+CORBA::ULong
TAO_DIOP_Profile::endpoint_count (void)
{
return this->count_;
@@ -295,21 +295,21 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
TAO::ObjectKey::encode_sequence_to_string (key.inout(),
this->object_key_);
- u_int buflen = (8 /* "corbaloc" */ +
- 1 /* colon separator */ +
- ACE_OS::strlen (::prefix_) +
- 1 /* colon separator */ +
- 1 /* major version */ +
- 1 /* decimal point */ +
- 1 /* minor version */ +
- 1 /* `@' character */ +
- ACE_OS::strlen (this->endpoint_.host ()) +
- 1 /* colon separator */ +
- 5 /* port number */ +
- 1 /* object key separator */ +
- ACE_OS::strlen (key.in ()));
-
- char * buf = CORBA::string_alloc (buflen);
+ size_t buflen = (8 /* "corbaloc" */ +
+ 1 /* colon separator */ +
+ ACE_OS::strlen (::prefix_) +
+ 1 /* colon separator */ +
+ 1 /* major version */ +
+ 1 /* decimal point */ +
+ 1 /* minor version */ +
+ 1 /* `@' character */ +
+ ACE_OS::strlen (this->endpoint_.host ()) +
+ 1 /* colon separator */ +
+ 5 /* port number */ +
+ 1 /* object key separator */ +
+ ACE_OS::strlen (key.in ()));
+
+ char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen));
static const char digits [] = "0123456789";
@@ -369,7 +369,7 @@ TAO_DIOP_Profile::encode_endpoints (void)
endpoints.length (this->count_);
const TAO_DIOP_Endpoint *endpoint = &this->endpoint_;
- for (size_t i = 0;
+ for (CORBA::ULong i = 0;
i < this->count_;
++i)
{
@@ -386,11 +386,12 @@ TAO_DIOP_Profile::encode_endpoints (void)
== 0)
|| (out_cdr << endpoints) == 0)
return -1;
- CORBA::ULong length = out_cdr.total_length ();
+ size_t length = out_cdr.total_length ();
IOP::TaggedComponent tagged_component;
tagged_component.tag = TAO_TAG_ENDPOINTS;
- tagged_component.component_data.length (length);
+ tagged_component.component_data.length (ACE_static_cast (CORBA::ULong,
+ length));
CORBA::Octet *buf =
tagged_component.component_data.get_buffer ();
@@ -398,7 +399,7 @@ TAO_DIOP_Profile::encode_endpoints (void)
iterator != 0;
iterator = iterator->cont ())
{
- CORBA::ULong i_length = iterator->length ();
+ size_t i_length = iterator->length ();
ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
buf += i_length;
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index 31ebd3c9b55..77d69cef369 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -80,7 +80,7 @@ public:
virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
- virtual size_t endpoint_count (void);
+ virtual CORBA::ULong endpoint_count (void);
virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
virtual CORBA::ULong hash (CORBA::ULong max
ACE_ENV_ARG_DECL);
@@ -120,7 +120,7 @@ protected:
TAO_DIOP_Endpoint endpoint_;
/// Number of endpoints in the list headed by <endpoint_>.
- size_t count_;
+ CORBA::ULong count_;
};
#if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 5d62a5221b3..1439e57f553 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -468,7 +468,8 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
if (j < option_count - 1)
end = options.find (option_delimiter, begin);
else
- end = len - begin; // Handle last endpoint differently
+ end = ACE_static_cast (int,
+ len - begin); // Handle last endpoint differently
if (end == begin)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index d49921c9ace..eb6320dfbd4 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -104,7 +104,7 @@ TAO_SHMIOP_Connection_Handler::open (void*)
}
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
// Not needed, anyway
this->state_changed (TAO_LF_Event::LFS_SUCCESS);
@@ -133,7 +133,7 @@ TAO_SHMIOP_Connection_Handler::activate (long flags,
THR_BOUND));
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
return TAO_SHMIOP_SVC_HANDLER::activate (flags,
n_threads,
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 687443aacb8..fb9b5691ee7 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -88,7 +88,7 @@ TAO_SHMIOP_Profile::endpoint (void)
return &this->endpoint_;
}
-size_t
+CORBA::ULong
TAO_SHMIOP_Profile::endpoint_count (void)
{
return this->count_;
@@ -310,21 +310,21 @@ TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
TAO::ObjectKey::encode_sequence_to_string (key.inout(),
this->object_key_);
- u_int buflen = (8 /* corbaloc */ +
- 1 /* colon separator */ +
- ACE_OS::strlen (::prefix_) +
- 1 /* colon separator */ +
- 1 /* major version */ +
- 1 /* decimal point */ +
- 1 /* minor version */ +
- 1 /* `@' character */ +
- ACE_OS::strlen (this->endpoint_.host ()) +
- 1 /* colon separator */ +
- 5 /* port number */ +
- 1 /* object key separator */ +
- ACE_OS::strlen (key.in ()));
-
- char * buf = CORBA::string_alloc (buflen);
+ size_t buflen = (8 /* corbaloc */ +
+ 1 /* colon separator */ +
+ ACE_OS::strlen (::prefix_) +
+ 1 /* colon separator */ +
+ 1 /* major version */ +
+ 1 /* decimal point */ +
+ 1 /* minor version */ +
+ 1 /* `@' character */ +
+ ACE_OS::strlen (this->endpoint_.host ()) +
+ 1 /* colon separator */ +
+ 5 /* port number */ +
+ 1 /* object key separator */ +
+ ACE_OS::strlen (key.in ()));
+
+ char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen));
static const char digits [] = "0123456789";
@@ -382,7 +382,7 @@ TAO_SHMIOP_Profile::encode_endpoints (void)
endpoints.length (this->count_);
TAO_SHMIOP_Endpoint *endpoint = &this->endpoint_;
- for (size_t i = 0;
+ for (CORBA::ULong i = 0;
i < this->count_;
++i)
{
@@ -399,11 +399,12 @@ TAO_SHMIOP_Profile::encode_endpoints (void)
== 0)
|| (out_cdr << endpoints) == 0)
return -1;
- CORBA::ULong length = out_cdr.total_length ();
+ size_t length = out_cdr.total_length ();
IOP::TaggedComponent tagged_component;
tagged_component.tag = TAO_TAG_ENDPOINTS;
- tagged_component.component_data.length (length);
+ tagged_component.component_data.length (ACE_static_cast (CORBA::ULong,
+ length));
CORBA::Octet *buf =
tagged_component.component_data.get_buffer ();
@@ -411,7 +412,7 @@ TAO_SHMIOP_Profile::encode_endpoints (void)
iterator != 0;
iterator = iterator->cont ())
{
- CORBA::ULong i_length = iterator->length ();
+ size_t i_length = iterator->length ();
ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
buf += i_length;
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 544319d21f7..3053242e39e 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -80,7 +80,7 @@ public:
virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
- virtual size_t endpoint_count (void);
+ virtual CORBA::ULong endpoint_count (void);
virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
virtual CORBA::ULong hash (CORBA::ULong max
ACE_ENV_ARG_DECL);
@@ -119,7 +119,7 @@ private:
TAO_SHMIOP_Endpoint endpoint_;
/// Number of endpoints in the list headed by <endpoint_>.
- size_t count_;
+ CORBA::ULong count_;
};
#if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 3b7ce43c25c..bff3c4dc6bc 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -88,7 +88,7 @@ TAO_UIOP_Connection_Handler::open (void*)
addr.get_path_name (), this->peer ().get_handle ()));
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
this->state_changed (TAO_LF_Event::LFS_SUCCESS);
@@ -116,7 +116,7 @@ TAO_UIOP_Connection_Handler::activate (long flags,
THR_BOUND));
// Set the id in the transport now that we're active.
- this->transport ()->id ((int) this->get_handle ());
+ this->transport ()->id ((size_t) this->get_handle ());
return TAO_UIOP_SVC_HANDLER::activate (flags,
n_threads,
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 159f53264a2..8f8c8dacbdb 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -88,7 +88,7 @@ TAO_UIOP_Profile::endpoint (void)
return &this->endpoint_;
}
-size_t
+CORBA::ULong
TAO_UIOP_Profile::endpoint_count (void)
{
return this->count_;
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index e1aaf7b0adf..e005dc9d3af 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -78,7 +78,7 @@ public:
virtual char *to_string (ACE_ENV_SINGLE_ARG_DECL);
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
- virtual size_t endpoint_count (void);
+ virtual CORBA::ULong endpoint_count (void);
virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
virtual CORBA::ULong hash (CORBA::ULong max
ACE_ENV_ARG_DECL);
@@ -118,7 +118,7 @@ private:
TAO_UIOP_Endpoint endpoint_;
/// Number of endpoints in the list headed by <endpoint_>.
- size_t count_;
+ CORBA::ULong count_;
};
#if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index 6dbf8eb54de..64cf66c6967 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -65,7 +65,7 @@ TAO_Synch_Queued_Message::fill_iov (int iovcnt_max,
{
// Collect the data in the iovec.
iov[iovcnt].iov_base = message_block->rd_ptr ();
- iov[iovcnt].iov_len = message_block_length;
+ iov[iovcnt].iov_len = ACE_static_cast (u_long, message_block_length);
// Increment iovec counter.
iovcnt++;
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 60536bee8da..030d3a79168 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -102,7 +102,7 @@ public:
int release);
/// Return the length of the operation.
- unsigned int operation_length (void) const;
+ size_t operation_length (void) const;
//@}
/// Return the underlying ORB.
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index b9f2f4c2dc6..2b3dee08baa 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -37,7 +37,7 @@ TAO_ServerRequest::operation (const char *operation,
this->operation_.set (operation, length, release);
}
-ACE_INLINE unsigned int
+ACE_INLINE size_t
TAO_ServerRequest::operation_length (void) const
{
return this->operation_.length ();
diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
index 9158819c7f7..e1ad37764c5 100644
--- a/TAO/tao/Tagged_Components.cpp
+++ b/TAO/tao/Tagged_Components.cpp
@@ -77,8 +77,8 @@ TAO_Tagged_Components::set_component_i (IOP::ComponentId tag,
component.tag = tag;
// Make a *copy* of the CDR stream...
- CORBA::ULong length = cdr.total_length ();
- component.component_data.length (length);
+ size_t length = cdr.total_length ();
+ component.component_data.length (ACE_static_cast (CORBA::ULong, length));
CORBA::Octet *buf = component.component_data.get_buffer ();
for (const ACE_Message_Block *i = cdr.begin ();
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index fae8fa4c7b8..541ddf256c1 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -39,7 +39,7 @@ ACE_RCSID (tao,
* Static function in file scope
*/
static void
-dump_iov (iovec *iov, int iovcnt, int id,
+dump_iov (iovec *iov, int iovcnt, size_t id,
size_t current_transfer,
const char *location)
{
@@ -112,7 +112,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
, flush_timer_id_ (-1)
, transport_timer_ (this)
, handler_lock_ (orb_core->resource_factory ()->create_cached_connection_lock ())
- , id_ ((long) this)
+ , id_ ((size_t) this)
, purging_order_ (0)
, char_translator_ (0)
, wchar_translator_ (0)
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index f7c46c4b6d9..6551171ead8 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -275,8 +275,8 @@ public:
* the <code>this</code> pointer for the instance on which
* it's called.
*/
- int id (void) const;
- void id (int id);
+ size_t id (void) const;
+ void id (size_t id);
/// Get and Set the purging order. The purging strategy uses the set
/// version to set the purging order.
@@ -995,7 +995,7 @@ protected:
* HINT: Protocol-specific transports that use connection handler
* might choose to set this to the handle for their connection.
*/
- int id_;
+ size_t id_;
/// Used by the LRU, LFU and FIFO Connection Purging Strategies.
unsigned long purging_order_;
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index 35d83851d6e..53da1d841b9 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -68,14 +68,14 @@ TAO_Transport::purging_order (unsigned long value)
this->purging_order_ = value;
}
-ACE_INLINE int
+ACE_INLINE size_t
TAO_Transport::id (void) const
{
return this->id_;
}
ACE_INLINE void
-TAO_Transport::id (int id)
+TAO_Transport::id (size_t id)
{
this->id_ = id;
}
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index eb23ede059a..f8a86092834 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -583,7 +583,7 @@ TAO_Transport_Cache_Manager::fill_set_i (DESCRIPTOR_SET& sorted_set)
// Do we need to worry about cache purging?
if (cache_maximum >= 0)
{
- current_size = this->cache_map_.current_size ();
+ current_size = ACE_static_cast (int, this->cache_map_.current_size ());
if (TAO_debug_level > 0)
{
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index ea4c2ef817a..a3997921575 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -3668,9 +3668,10 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
case CORBA::tk_except:
case CORBA::tk_value:
{
- if (!cdr.write_ulong (x->length_)
+ CORBA::ULong xlen = ACE_static_cast (CORBA::ULong, x->length_);
+ if (!cdr.write_ulong (xlen)
|| !cdr.write_octet_array ((CORBA::Octet*)x->buffer_,
- x->length_))
+ xlen))
{
return 0;
}
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
index 7e2ef5c444e..729c1878842 100644
--- a/TAO/tao/corbafwd.cpp
+++ b/TAO/tao/corbafwd.cpp
@@ -26,7 +26,7 @@ CORBA::string_dup (const char *str)
size_t len = ACE_OS::strlen (str);
// This allocates an extra byte for the '\0';
- char * copy = CORBA::string_alloc (len);
+ char * copy = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, len));
// The memcpy() below assumes that the destination is a valid buffer.
if (copy == 0)
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 320964181e1..fe7a34d5c1e 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -486,7 +486,7 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names,
this->parser_names_ =
new char *[this->parser_names_count_];
- size_t index = 0;
+ CORBA::ULong index = 0;
this->parser_names_[index] = CORBA::string_dup ("DLL_Parser");
index++;
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 94e7b4cc691..44c2811e2bd 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -179,7 +179,7 @@ protected:
/// Specifies the limit on the number of muxed connections
/// allowed per-property for the ORB. A value of 0 indicates no
/// limit
- size_t max_muxed_connections_;
+ int max_muxed_connections_;
/// If <0> then we create reactors with signal handling disabled.
int reactor_mask_signals_;
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 3d721daf21f..db5cf667fa7 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -51,7 +51,7 @@ TAO_ORB_Parameters::parse_endpoints (ACE_CString &endpoints,
const char endpoints_delimiter = ';';
- int length = endpoints.length ();
+ size_t length = endpoints.length ();
if (endpoints[0] == endpoints_delimiter ||
endpoints[length - 1] == endpoints_delimiter)
@@ -66,7 +66,7 @@ TAO_ORB_Parameters::parse_endpoints (ACE_CString &endpoints,
{
int endpoints_count = 1;
- for (int j = 0; j != length; ++j)
+ for (size_t j = 0; j != length; ++j)
{
if (endpoints[j] == endpoints_delimiter)
endpoints_count++;