summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-11-29 10:13:27 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-11-29 10:13:27 +0000
commit99c7840a7af85d0a833565903d6697949ecaf74a (patch)
treecae04f2b8e7223271782f0f7f9b15df89379432d
parent1945c59f8250d670ccb196885500bb1ef9232489 (diff)
downloadATCD-99c7840a7af85d0a833565903d6697949ecaf74a.tar.gz
Thu Nov 29 10:13:16 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/DLL_ORB/client.cpp: * tests/DLL_ORB/server.cpp: Fixed compile problems
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tests/DLL_ORB/client.cpp3
-rw-r--r--TAO/tests/DLL_ORB/server.cpp4
3 files changed, 9 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 672e0467563..02f508d61ce 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 29 10:13:16 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/DLL_ORB/client.cpp:
+ * tests/DLL_ORB/server.cpp:
+ Fixed compile problems
+
Thu Nov 29 10:12:20 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_2677_Regression/server.cpp:
diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp
index 6ea2ac1955b..590432ba7eb 100644
--- a/TAO/tests/DLL_ORB/client.cpp
+++ b/TAO/tests/DLL_ORB/client.cpp
@@ -28,10 +28,9 @@ ACE_TMAIN(int, ACE_TCHAR *[])
// In the process of doing this, the Test method provided by target
// CORBA object will be invoked.
if (ACE_Service_Config::process_directive (
- ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
+ ACE_DYNAMIC_SERVICE_DIRECTIVE(
"Client_Module",
"Test_Client_Module",
- TAO_VERSION,
"_make_Test_Client_Module",
"-k file://test.ior")) != 0)
{
diff --git a/TAO/tests/DLL_ORB/server.cpp b/TAO/tests/DLL_ORB/server.cpp
index 522c8f59826..268e1b0d546 100644
--- a/TAO/tests/DLL_ORB/server.cpp
+++ b/TAO/tests/DLL_ORB/server.cpp
@@ -28,8 +28,8 @@ ACE_TMAIN(int, ACE_TCHAR *[])
// 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 (
- ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("Server_Module",
- "Test_Server_Module", TAO_VERSION, "_make_Test_Server_Module", "")) != 0)
+ ACE_DYNAMIC_SERVICE_DIRECTIVE("Server_Module",
+ "Test_Server_Module", "_make_Test_Server_Module", "")) != 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
"%p\n",