diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-01-31 04:04:47 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-01-31 04:04:47 +0000 |
| commit | d8f60a1286a4c45ab6fa5b057d9fc73a86573de9 (patch) | |
| tree | 574c81f0251e50d3713b4e8cd47876f53b926a7b | |
| parent | d5caa685a4b4e630caca13e88c53b7aa0455d273 (diff) | |
| download | ATCD-d8f60a1286a4c45ab6fa5b057d9fc73a86573de9.tar.gz | |
ChangeLogTag:Sun Jan 30 19:57:37 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
5 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b395d3e88c3..22e125bfadd 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,5 +1,9 @@ Sun Jan 30 19:57:37 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + * orbsvcs/ImplRepo_Service/ImR_Activator_i.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp: * orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp: * orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp: * orbsvcs/orbsvcs/IFRService/RecursDef_i.h: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index a776d2c927a..c2f07a4fa3d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -8,13 +8,14 @@ #include "ace/ARGV.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" +#include "ace/os_include/os_netdb.h" static ACE_CString getActivatorName() { char host_name[MAXHOSTNAMELEN]; ACE_OS::hostname (host_name, MAXHOSTNAMELEN); - return ACE_CString(host_name); + return ACE_CString (host_name); } ImR_Activator_i::ImR_Activator_i (void) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index fbc85911317..560eacf6237 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -20,6 +20,7 @@ #include "ace/Process_Manager.h" #include "ace/Vector_T.h" +#include "ace/SString.h" #include "ace/Hash_Map_Manager.h" #include "ace/Bound_Ptr.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp index b343c0e9af7..c9dee536cf3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp @@ -3,10 +3,14 @@ #include "AMI_Replication_Strategy.h" #include "AMI_Primary_Replication_Strategy.h" +#include "ace/Auto_Ptr.h" + + ACE_RCSID (EventChannel, AMI_Replication_Strategy, "$Id$") + AMI_Replication_Strategy::AMI_Replication_Strategy(bool mt) : mt_(mt) { @@ -62,4 +66,3 @@ int AMI_Replication_Strategy::release (void) { return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index a8282efc4b9..737b88ccc8c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -9,12 +9,15 @@ #include "tao/ORBInitializer_Registry.h" #include "tao/CDR.h" +#include "ace/Auto_Ptr.h" #include "ace/OS_NS_strings.h" + ACE_RCSID (EventChannel, Replication_Service, "$Id$") + namespace FTRTEC { namespace { @@ -105,7 +108,7 @@ namespace FTRTEC void Replication_Service::become_primary() { TAO_FTRTEC::Log(3, "become_primary\n"); - + Replication_Strategy* strategy = replication_strategy->make_primary_strategy(); |