summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-02-28 11:39:11 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-02-28 11:39:11 +0000
commit03b796099d95292867f6e74bcd32505c39b61d99 (patch)
treebdc6cc48cc6c31e73ab01bf4d0f48b31210f5fe2
parent09b842d0a9090741612e09df737905b3dae7696e (diff)
downloadATCD-03b796099d95292867f6e74bcd32505c39b61d99.tar.gz
ChangeLogTag: Mon Feb 28 11:39:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyPersistent.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 672828f2d24..56f4c25c902 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -69,6 +69,10 @@ namespace TAO
TAO_Root_POA::imr_client_adapter_name ()
);
+#if !defined (TAO_AS_STATIC_LIBS)
+ // In case we build shared, try to load the ImR Client library, in a
+ // static build we just can't do this, so don't try it, lower layers
+ // output an error then.
if (adapter == 0)
{
ACE_Service_Config::process_directive (
@@ -79,6 +83,7 @@ namespace TAO
ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
TAO_Root_POA::imr_client_adapter_name ());
}
+#endif /* !TAO_AS_STATIC_LIBS */
if (adapter != 0)
{