diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-06 18:23:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-06 18:23:54 +0000 |
| commit | 920702d1cb4579d9de4aedb1e45147f46c31a74f (patch) | |
| tree | 1cbb5da8beb823c4542ba5bf87f4351dfb4ccdc0 | |
| parent | 13e30da7ffcf2db87f2df4f664ae73e102407877 (diff) | |
| download | ATCD-920702d1cb4579d9de4aedb1e45147f46c31a74f.tar.gz | |
Mon Oct 6 18:23:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/params.cpp | 13 | ||||
| -rw-r--r-- | TAO/tao/params.h | 6 |
3 files changed, 15 insertions, 11 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2f63c9d2533..d571467e89d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,4 +1,9 @@ -Mon Oct 6 15:20:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Oct 6 18:23:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/params.{h,cpp}: + Changed poa directive to ACE_TCHAR + +Mon Oct 6 18:20:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Oneway_Send_Timeouts/Client.cpp * tests/Oneway_Send_Timeouts/main.cpp diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index d5cb2ac98a8..3036d6d86eb 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -55,11 +55,10 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void) , thread_lane_resources_manager_factory_name_ ("Default_Thread_Lane_Resources_Manager_Factory") , poa_factory_name_ ("TAO_Object_Adapter_Factory") , poa_factory_directive_ - (ACE_TEXT_ALWAYS_CHAR - (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", - "TAO_PortableServer", - "_make_TAO_Object_Adapter_Factory", - ""))) + (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", + "TAO_PortableServer", + "_make_TAO_Object_Adapter_Factory", + "")) , collocation_resolver_name_ ("Default_Collocation_Resolver") { for (int i = 0; i != TAO_NO_OF_MCAST_SERVICES; ++i) @@ -382,12 +381,12 @@ TAO_ORB_Parameters::poa_factory_name (void) const } void -TAO_ORB_Parameters::poa_factory_directive (const char *s) +TAO_ORB_Parameters::poa_factory_directive (const ACE_TCHAR *s) { this->poa_factory_directive_ = s; } -const char * +const ACE_TCHAR * TAO_ORB_Parameters::poa_factory_directive (void) const { return this->poa_factory_directive_.c_str (); diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 93b4f7dafb8..55ae8c78513 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -235,8 +235,8 @@ public: void poa_factory_name (const char *s); const char *poa_factory_name (void) const; - void poa_factory_directive (const char *s); - const char *poa_factory_directive (void) const; + void poa_factory_directive (const ACE_TCHAR *s); + const ACE_TCHAR *poa_factory_directive (void) const; void endpoint_selector_factory_name (const char *s); const char *endpoint_selector_factory_name (void) const; @@ -446,7 +446,7 @@ private: * The service configurator directive used to load * poa_factory_name_ dynamically. */ - ACE_CString poa_factory_directive_; + ACE_TString poa_factory_directive_; /** * Name of the collocation resolver that needs to be instantiated. |