diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-11-25 19:39:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 19:39:59 +0100 |
| commit | 7f58353152673a611a86843b1db6f9453675d087 (patch) | |
| tree | 1293b42d943690db37fca9fdcd77f97f5a063655 | |
| parent | 0ac7674ea80eb14d47084ea54c778c05acbd667b (diff) | |
| parent | 139feb142fbfb12dc97bd09f66dbfc4ff9755263 (diff) | |
| download | ATCD-7f58353152673a611a86843b1db6f9453675d087.tar.gz | |
Merge pull request #1983 from jwillemsen/jwi-warninggitignore
Extend gitignore, fixed conversion warnings, removed empty lines
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 949cea02040..8d1ca1d523e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ lib*.so* lib*.dylib *~ ipch/ +*.vsidx /ACE/ace/config.h /ACE/bin/MakeProjectCreator/config/default.features @@ -39,6 +40,7 @@ ipch/ /build /ACE/build /TAO/build +/MPC *.o *.res @@ -46,3 +48,5 @@ ipch/ *.VC.db* *.tds *.*codeanalysis* +read.lock +fileList.bin 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 40368f9daef..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 const 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/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 4446ff28eb2..1585ccb22fa 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -58,8 +58,6 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory () { // No need to call CORBA::remove_ref() on this->old_orf_. It is a // "_var" object, meaning that will be done automatically. - - if (!CORBA::is_nil (this->lm_.in ())) { const CORBA::ULong len = this->fcids_.size (); |