diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2014-07-17 14:05:41 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2014-07-17 14:05:41 +0000 |
| commit | a09e1bcb40857353a099d6a881963d61db4e69d4 (patch) | |
| tree | 5524b7b79add9f0ac60f8f4139c942afc0aa44bd | |
| parent | d49730ac21444b6e2e82901c558ad3dc3c0ed8d8 (diff) | |
| download | ATCD-a09e1bcb40857353a099d6a881963d61db4e69d4.tar.gz | |
Thu Jul 17 13:19:54 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h:
* orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp:
Make the new global strategy option wchar compatible.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e766b51a3ad..76c0850c3ed 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Jul 17 13:19:54 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h: + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp: + Make the new global strategy option wchar compatible. + Wed Jul 16 16:42:52 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index eabd1280b7f..977607067ac 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -89,15 +89,15 @@ TAO_FT_Naming_Manager::~TAO_FT_Naming_Manager (void) } void -TAO_FT_Naming_Manager::set_global_strategy (const char *name) +TAO_FT_Naming_Manager::set_global_strategy (const ACE_TCHAR *name) { - if (ACE_OS::strcasecmp (name,"round") == 0 || - ACE_OS::strcasecmp (name,"round_robin") == 0) + if (ACE_OS::strcasecmp (name, ACE_TEXT ("round")) == 0 || + ACE_OS::strcasecmp (name, ACE_TEXT ("round_robin")) == 0) { this->use_global_ = true; this->global_strategy_ = ::FT_Naming::ROUND_ROBIN; } - else if (ACE_OS::strcasecmp (name,"random") == 0) + else if (ACE_OS::strcasecmp (name, ACE_TEXT ("random")) == 0) { this->use_global_ = true; this->global_strategy_ = ::FT_Naming::RANDOM; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h index 95b868b916f..fdb5b1d4b2c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h @@ -279,7 +279,7 @@ public: void set_object_group_stale (const FT_Naming::ObjectGroupUpdate & group_info); /// Initialize a global load balancing strategy - void set_global_strategy (const char *strat_name); + void set_global_strategy (const ACE_TCHAR *strat_name); /// Destructor. ~TAO_FT_Naming_Manager (void); |