diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2015-06-04 14:19:31 -0500 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2015-06-04 14:19:31 -0500 |
| commit | c0f166c8ef8638e9331b706e8ccf5c679a013f7e (patch) | |
| tree | 5e5a14c470ce4488f34339246827b8d16dc4cc50 | |
| parent | f579ed5cb4f105bc11b2f6a2c13e05701dd5ef10 (diff) | |
| download | ATCD-c0f166c8ef8638e9331b706e8ccf5c679a013f7e.tar.gz | |
Applying Cesar Mello's fix for wchar IFR build
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ACE/THANKS b/ACE/THANKS index bbbb98c2347..6072880a6fa 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2394,6 +2394,7 @@ David Lifshitz <dlifshitz at macadamian dot com> Milo H. Fields <mfields at paladin-sys dot com> Thomas Schmidt <TC dot Schmidt at gmx dot net> Joe Zendle <jzendle at gmail dot com> +Cesar Mello <cmello at gmail dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 69bfa6d3606..64c18c3bbf4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -64,7 +64,7 @@ TAO_AliasDef_i::type_i (void) return this->repo_->tc_factory ()->create_alias_tc (id.c_str (), name.c_str (), - tc.in ()); + ACE_TEXT_ALWAYS_CHAR (tc.in ())); } CORBA::IDLType_ptr |