diff options
author | johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-02-12 15:54:34 +0000 |
---|---|---|
committer | johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-02-12 15:54:34 +0000 |
commit | abe8fdd31c874c3a522bc7c62d07e48cbb1ba9cc (patch) | |
tree | 3174ada95e10dcc9d35c8954798350a77ad26c2b /TAO/tests | |
parent | d06af6e271ca3d4eae96755a417af62097e65018 (diff) | |
download | ATCD-abe8fdd31c874c3a522bc7c62d07e48cbb1ba9cc.tar.gz |
ChangeLogTag: Tue Feb 12 15:49:53 UTC 2008 Ciju John <johnc at ociweb dot com>
Diffstat (limited to 'TAO/tests')
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Client.cpp | 1 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Client.h | 2 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Client_Task.h | 2 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/ORB_Task.h | 2 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc | 2 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Server.cpp | 3 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Server.h | 2 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Server_Task.h | 2 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Test.idl | 1 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Test_i.cpp | 1 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Test_i.h | 2 | ||||
-rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/main.cpp | 6 |
12 files changed, 23 insertions, 3 deletions
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp index e6f9e4bf8e2..14196afba62 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp @@ -1,3 +1,4 @@ +// $Id$ #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.h b/TAO/tests/Oneway_Send_Timeouts/Client.h index 4413cacdbfb..73ff2b8282f 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client.h +++ b/TAO/tests/Oneway_Send_Timeouts/Client.h @@ -1,3 +1,5 @@ +// $Id$ + #ifndef _CLIENT_ #define _CLIENT_ diff --git a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h index b40ae16d536..16f16b996be 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h +++ b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h @@ -1,3 +1,5 @@ +// $Id$ + #ifndef _CLIENT_TASK_ #define _CLIENT_TASK_ diff --git a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h index 60b870e3799..88ce953eee7 100644 --- a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h +++ b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h @@ -1,3 +1,5 @@ +// $Id$ + #ifndef _ORB_TASK_ #define _ORB_TASK_ diff --git a/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc b/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc index 8fbfa2231b4..4bebb587f1d 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc +++ b/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc @@ -1,3 +1,5 @@ +// -*- MPC -*- +// $Id$ project(*idl): taoidldefaults { IDL_Files { diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp index 5b707718d15..460882caa30 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp @@ -1,3 +1,4 @@ +// $Id$ #include "Server.h" @@ -169,7 +170,7 @@ Server::run (bool management) void Server::shutdown () { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); if (shutdown_) { return; } diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.h b/TAO/tests/Oneway_Send_Timeouts/Server.h index a19949e28fc..ce52982ca29 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Server.h +++ b/TAO/tests/Oneway_Send_Timeouts/Server.h @@ -1,3 +1,5 @@ +// $Id$ + #ifndef _SERVER_ #define _SERVER_ diff --git a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h index 013d41f58e9..7e32e9ff0c7 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h +++ b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h @@ -1,3 +1,5 @@ +// $Id$ + #ifndef _SERVER_TASK_ #define _SERVER_TASK_ diff --git a/TAO/tests/Oneway_Send_Timeouts/Test.idl b/TAO/tests/Oneway_Send_Timeouts/Test.idl index 9f0a7fcf03e..2794efc1f03 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Test.idl +++ b/TAO/tests/Oneway_Send_Timeouts/Test.idl @@ -1,3 +1,4 @@ +// $Id$ interface Test { diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp index e4b74618733..28ae1e4385b 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp @@ -1,3 +1,4 @@ +// $Id$ #include "Test_i.h" diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.h b/TAO/tests/Oneway_Send_Timeouts/Test_i.h index a62a53cead8..a70c3ae45b6 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Test_i.h +++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.h @@ -1,3 +1,5 @@ +// $Id$ + #ifndef _TEST_I_ #define _TEST_I_ diff --git a/TAO/tests/Oneway_Send_Timeouts/main.cpp b/TAO/tests/Oneway_Send_Timeouts/main.cpp index 709b5d539d1..55ce79f81d4 100644 --- a/TAO/tests/Oneway_Send_Timeouts/main.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/main.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "Server_Task.h" #include "Client_Task.h" @@ -94,12 +96,12 @@ MyMain::MyMain (int argc, ACE_TCHAR* argv[]) } if (ACE_OS::strcasecmp (argv[p], "-s") == 0) { - const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : NULL); + const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : 0); s_init_ = this->init_server (s_args); p++; } else if (ACE_OS::strcasecmp (argv[p], "-c") == 0) { - const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : NULL); + const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : 0); if (s_init_) { this->init_client (s_args); } |