diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-04-17 12:23:45 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-04-17 12:23:45 +0200 |
| commit | 353c5cd7e792865fcae7b71d9b8e7c577e21ea62 (patch) | |
| tree | f1a2df6ba71ce21482988ba5c57426914d220c82 | |
| parent | 6587242537bb62b4e54d110a0262c269525966d1 (diff) | |
| parent | 2c635535b814a5ecdff9c76c40b22c8a5fbaa55f (diff) | |
| download | ATCD-353c5cd7e792865fcae7b71d9b8e7c577e21ea62.tar.gz | |
Merge branch 'jwi-implreprestart-889' of https://github.com/jwillemsen/ATCD into jwi-implreprestart-889
| -rw-r--r-- | TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index 389059de415..179afa5da9f 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -248,7 +248,7 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb, ORBSVCS_DEBUG((LM_DEBUG,"Factory connected\n")); CORBA::String_var my_ior_string = orb->object_to_string(ec); - int len = ACE_OS::strlen(my_ior_string.in()) ; + size_t const len = ACE_OS::strlen(my_ior_string.in()) ; if (stream.send_n(my_ior_string.in(), len) != len) ORBSVCS_ERROR_RETURN((LM_ERROR, "(%P|%t) IOR Transmission Error\n"), -1); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index 2c4ee830c36..aeb2d6bfb1c 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -106,7 +106,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( options.setenv(ACE_TEXT("EventChannelFactoryAddr"), buf); // extract the object ID from the criteria - for (size_t i = 0; i < the_criteria.length(); ++i) + for (CORBA::ULong i = 0; i < the_criteria.length(); ++i) { const CosNaming::Name& name = the_criteria[i].nam; if (name.length() > 0) { |