diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-02-26 14:05:15 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-02-26 14:05:15 +0000 |
| commit | 062e0e7c7b8e256990ca0662ba4a9ae34401f915 (patch) | |
| tree | 896491a312e05d4c696391dec4b5ac9b0a60e43b | |
| parent | e3b89122df5b0aa9431877364b95853a6020a664 (diff) | |
| download | ATCD-062e0e7c7b8e256990ca0662ba4a9ae34401f915.tar.gz | |
Tue Feb 26 14:03:02 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9567e721663..92e21456e89 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Feb 26 14:03:02 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h: + + Complete the wide char fix started on Feb 25 01:32:42 UTC 2013. + Mon Feb 25 17:32:02 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp: diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h index 9b5a4234183..6cbcfb50885 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h @@ -94,7 +94,7 @@ private: /// write the IOR to a file so that it can be read later. int write_ior_to_file (const ACE_TCHAR *filename, - const ACE_TCHAR *ior); + const char *ior); CORBA::ORB_var orb_; int argc_; |