diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-01 15:54:52 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-01 15:54:52 +0000 |
| commit | 23de61f9a56c2637fed2436b54838bd02d87a2a0 (patch) | |
| tree | 3db5203cb21550c3455c54a9e8a03b2612ef6bcd | |
| parent | e3af852bff87bfa0fd80671ad34aca3ec007e08a (diff) | |
| download | ATCD-23de61f9a56c2637fed2436b54838bd02d87a2a0.tar.gz | |
Mon Apr 1 15:51:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog_Asynch_ImR | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/TAO/ChangeLog_Asynch_ImR b/TAO/ChangeLog_Asynch_ImR index e82acf490c3..5d78c937690 100644 --- a/TAO/ChangeLog_Asynch_ImR +++ b/TAO/ChangeLog_Asynch_ImR @@ -1,3 +1,13 @@ +Mon Apr 1 15:51:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + allow collocation calls to support the AMI callbacks. + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp: + + Fix a scoreboard build error. + Fri Mar 29 22:52:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 3bad6c22b3b..db27f743f34 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -171,7 +171,7 @@ int ImR_Locator_i::init (Options& opts) { ACE_CString cmdline = opts.cmdline (); - cmdline += " -orbcollocation no -orbuseimr 0"; + cmdline += " -orbuseimr 0"; ACE_ARGV av (cmdline.c_str ()); int argc = av.argc (); ACE_TCHAR** argv = av.argv (); diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp index b911ccfaca5..b623f0e3c55 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- $Id$ */ #include "Test_i.h" +#include "ace/OS_NS_unistd.h" Test_i::Test_i (CORBA::Short server_num, CORBA::Short reply_delay_secs) |