diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2015-06-04 16:20:05 -0500 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2015-06-04 16:20:05 -0500 |
| commit | 8afda7a147aa2ae6f2d5f7a302aa09aa2e088cf7 (patch) | |
| tree | 7af7d87eeef43e124602afde4c99d5b4c9fb5ccd | |
| parent | f579ed5cb4f105bc11b2f6a2c13e05701dd5ef10 (diff) | |
| parent | 9acd83fb4fbdf677f4ab402da4dd2e875ec4d14e (diff) | |
| download | ATCD-8afda7a147aa2ae6f2d5f7a302aa09aa2e088cf7.tar.gz | |
Merge pull request #90 from pmesnier/master
IFR WChar build fix & typo on IORTable init
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 4 |
3 files changed, 4 insertions, 3 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 diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index b8a11f5cec0..f2dc8ee9bd3 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2744,7 +2744,7 @@ TAO_ORB_Core::resolve_iormanipulation_i (void) void TAO_ORB_Core::resolve_ior_table_i (void) { - TAO_Adapter_Factory *factory = 0; + TAO_Adapter_Factory *factory = ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (this->configuration (), ACE_TEXT("TAO_IORTable")); if (factory == 0) @@ -2778,7 +2778,7 @@ TAO_ORB_Core::resolve_ior_table_i (void) void TAO_ORB_Core::resolve_async_ior_table_i (void) { - TAO_Adapter_Factory *factory = 0; + TAO_Adapter_Factory *factory = ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (this->configuration (), ACE_TEXT("TAO_Async_IORTable")); if (factory == 0) |