diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-04-27 11:34:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-27 11:34:08 +0200 |
| commit | 0f033cfec8dd996d1c039e580fabd6b1ff61b8bc (patch) | |
| tree | f5ee55780b57332e5467d101d69de07b9015d987 | |
| parent | 629588a38264e5ff3d2fd2a0c8f866d863b332b7 (diff) | |
| parent | e4e6b0cf6be0691e7579e16176cc0ec9e4f09628 (diff) | |
| download | ATCD-0f033cfec8dd996d1c039e580fabd6b1ff61b8bc.tar.gz | |
Merge pull request #896 from jwillemsen/master
Fix unresolved symbol with MinGW and fix linux warning
| -rw-r--r-- | TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h | 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 179afa5da9f..40368f9daef 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); - size_t const len = ACE_OS::strlen(my_ior_string.in()) ; + int 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/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index 58d28fb5f01..86d8c7b604c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -57,7 +57,7 @@ typedef ACE_INT32 Act_token_type; #if defined (ACE_WIN32) class Active_Pid_Setter; -class Watchdog : public ACE_Task_Base +class Activator_Export Watchdog : public ACE_Task_Base { public: Watchdog (ACE_Process_Manager& procman); |