summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2013-04-23 15:42:36 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2013-04-23 15:42:36 +0000
commitd95ceebdd6747ada25cc264e543812105eb75b27 (patch)
treef81cf3608839668200d70ba95e64beeacdf9e819
parentc8bcb277128073f57dd106519ef98ac287cf5efd (diff)
downloadATCD-d95ceebdd6747ada25cc264e543812105eb75b27.tar.gz
Tue Apr 23 15:41:07 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc2
3 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 83eb68eef42..fb89086e1af 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr 23 15:41:07 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp:
+ * orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc:
+
+ Support for static-linked builds
+
Tue Apr 23 14:45:23 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* tao/IORTable/Async_IORTable.mpc:
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
index 08210a261cf..2a642b40cd6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
@@ -7,6 +7,7 @@
#include "tao/IORTable/IORTable.h"
#include "tao/PortableServer/Root_POA.h"
+#include "tao/ImR_Client/ImR_Client.h"
#include "ace/Get_Opt.h"
#include "ace/streams.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
index bb6898e4972..11aab468634 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
custom_only = 1
}
-project(*server): taoserver, iortable, avoids_minimum_corba, avoids_corba_e_micro {
+project(*server): taoserver, iortable, imr_client, avoids_minimum_corba, avoids_corba_e_micro {
after += *idl
exename = server
IDL_Files {