summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-06-17 09:11:05 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-06-17 09:11:05 +0000
commita3609fdb9d24ea1f0a5634b29e61e8e5ab3372e5 (patch)
treee38ef60f4e6c729d0a1b0d8b0b4e2b72829c87ac
parent7608af651a8440b5131c2e5a55f0d9da9bef58e6 (diff)
downloadATCD-a3609fdb9d24ea1f0a5634b29e61e8e5ab3372e5.tar.gz
ChangeLogTag: Fri Jun 17 09:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tests/DLL_ORB/client.cpp7
-rw-r--r--TAO/tests/DLL_ORB/server.cpp4
3 files changed, 14 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a414036764d..d80256f2e86 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 17 09:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Bug_1551_Regression/test.mpc:
+ Simplified this mpc file
+
Fri Jun 17 09:56:44 2005 Simon McQueen <sm@prismtech.com>
* tao/Valuetype/ValueBase.cpp:
diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp
index 70c797fe7d1..aa7730d7463 100644
--- a/TAO/tests/DLL_ORB/client.cpp
+++ b/TAO/tests/DLL_ORB/client.cpp
@@ -27,7 +27,12 @@ main (int, char *[])
//
// In the process of doing this, the Test method provided by target
// CORBA object will be invoked.
- if (ACE_Service_Config::process_directive ("dynamic Client_Module Service_Object * Test_Client_Module:_make_Test_Client_Module() \"-k file://test.ior\"") != 0)
+ if (ACE_Service_Config::process_directive (
+ ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ "Client_Module",
+ "Test_Client_Module",
+ "_make_Test_Client_Module",
+ "-k file://test.ior") != 0))
{
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/DLL_ORB/server.cpp b/TAO/tests/DLL_ORB/server.cpp
index dcba4ca285c..c54ec7f983a 100644
--- a/TAO/tests/DLL_ORB/server.cpp
+++ b/TAO/tests/DLL_ORB/server.cpp
@@ -27,7 +27,9 @@ main (int, char *[])
//
// In the process of doing this, the Test CORBA object will be
// activated, and the ORB will be run.
- if (ACE_Service_Config::process_directive ("dynamic Server_Module Service_Object * Test_Server_Module:_make_Test_Server_Module() \"\"") != 0)
+ if (ACE_Service_Config::process_directive (
+ ACE_DYNAMIC_SERVICE_DIRECTIVE("Server_Module",
+ "Test_Server_Module", "_make_Test_Server_Module", "")) != 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
"%p\n",