summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-06-17 09:12:16 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-06-17 09:12:16 +0000
commit42118a58915bfb3831fb3fb9d3a52e7dbf407642 (patch)
tree266112f0e2a5d39716ab551e3101239261fa8b81
parenta3609fdb9d24ea1f0a5634b29e61e8e5ab3372e5 (diff)
downloadATCD-42118a58915bfb3831fb3fb9d3a52e7dbf407642.tar.gz
ChangeLogTag: Fri Jun 17 09:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp5
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d80256f2e86..6a151e82d5d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 17 09:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/DLL_ORB/client.cpp:
+ * tests/DLL_ORB/server.cpp:
+ Use the new macro ACE_DYNAMIC_SERVICE_DIRECTIVE to load the
+ libraries
+
Fri Jun 17 09:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_1551_Regression/test.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 935f9661294..29cace33f28 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -8,14 +8,13 @@
#include "tao/PI/ORBInitInfo.h"
#include "tao/debug.h"
-
ACE_RCSID (PortableGroup,
PortableGroup_ORBInitializer,
"$Id$")
-
static const char pg_poa_factory_name[] = "TAO_PG_POA";
-static const char pg_poa_factory_directive[] = "dynamic TAO_PG_POA Service_Object * TAO_PortableGroup:_make_TAO_PG_Object_Adapter_Factory()";
+static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ "TAO_PG_POA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
void
TAO_PortableGroup_ORBInitializer::pre_init (