Mon Feb 25 15:36:17 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

18 files changed, 59 insertions, 30 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c58af5c668e..7001519e6ad 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,30 @@
+Mon Feb 25 15:36:17 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * orbsvcs/IFR_Service/IFR_Server.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Activator.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator.cpp:
+        * orbsvcs/Naming_Service/NT_Naming_Server.cpp:
+        * orbsvcs/Notify_Service/NT_Notify_Server.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp:
+        * orbsvcs/tests/Bug_3215_Regression/client.cpp:
+        * orbsvcs/tests/Bug_3215_Regression/server.cpp:
+        * orbsvcs/tests/Bug_3216_Regression/client.cpp:
+        * orbsvcs/tests/Bug_3216_Regression/server.cpp:
+        * orbsvcs/tests/Security/mixed_security_test/client.cpp:
+        * orbsvcs/tests/Security/mixed_security_test/server.cpp:
+
+          Use ACE_TMAIN instead of main as the program entry point to comply
+          with ACE/TAO/CIAO coding standards.
+
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc:
+
+          MPC doesn't recognize ACE_TMAIN as an entry point, as such, we need
+          to explicitly set exename in the MPC file.
+
 Mon Feb 25 09:45:37 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/POA/Loader/Servant_Locator.cpp:
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index 99f6128eb74..80dbe39c996 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -34,7 +34,7 @@ IFR_Service_Shutdown_Functor::operator() (int which_signal)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   IFR_Service server;
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 0df317f0068..8086fbff1ea 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -184,7 +184,7 @@ run_service_command (Activator_Options& opts)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Activator_Options opts;
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 22e31ef75d5..b3c9f550846 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -167,7 +167,7 @@ run_service_command (Options& opts)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Options opts;
 
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index f8533a74e85..64dbeb96fc7 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -220,7 +220,7 @@ Options::run (int argc, char* argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   return OPTIONS::instance ()->run (argc, argv);
 }
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index 533420ad49a..90ce225d6e1 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -17,7 +17,7 @@
 // = AUTHORS
 //    John Tucker <jtucker@infoglide.com>,
 //    Mike Vitalo <mvitalo@infoglide.com>, and
-//    David Robison <drrobison@openroadsconsulting.com> 
+//    David Robison <drrobison@openroadsconsulting.com>
 //
 // ============================================================================
 
@@ -223,7 +223,7 @@ Options::run (int argc, char* argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   return OPTIONS::instance ()->run (argc, argv);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index 758a005c634..2b25bce008b 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -71,7 +71,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
 
   int priority =
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index 51b1624fed7..e25b190f4d8 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -211,7 +211,7 @@ join_object_group (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
 
   int priority =
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
index 1ae76ad9d3e..9a897e2a30d 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
@@ -8,8 +8,9 @@ project(*Performance_IDL): loadbalancing, strategies {
 }
 
 project(*Performance_Server): loadbalancing, pi_server, strategies {
-  after += *Performance_IDL
-  avoids += ace_for_tao
+  after   += *Performance_IDL
+  avoids  += ace_for_tao
+  exename  = server
   Source_Files {
     server.cpp
     Roundtrip.cpp
@@ -25,8 +26,9 @@ project(*Performance_Server): loadbalancing, pi_server, strategies {
 }
 
 project(*Performance_Client): loadbalancing, strategies {
-  after += *Performance_IDL
-  avoids += ace_for_tao
+  after   += *Performance_IDL
+  avoids  += ace_for_tao
+  exename  = client
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index f5c621601ff..64161d30674 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -73,7 +73,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index a5d5f6b0598..b6fc63306d1 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -214,7 +214,7 @@ join_object_group (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp
index d8ebf631bdc..d0a0f8c3a7d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp
@@ -41,7 +41,7 @@ load_file (Vector &vector,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Vector X;
   load_file (X, argv[1]);
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index 22b7c893501..f53cf76743c 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -36,25 +36,25 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   CORBA::Boolean result = 0;
   try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" );
-      
+
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior );
-      
+
 
       Test::Hello_var hello =
         Test::Hello::_narrow(tmp.in () );
-      
+
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -66,13 +66,13 @@ main (int argc, char *argv[])
 
       // Check this isn't generating transients for any other reason
       hello->ping ();
-      
+
 
 
       try
         {
           hello->throw_location_forward ();
-          
+
 
           ACE_DEBUG ((LM_ERROR, "REGRESSION - Test has failed !!!\n"));
           result = 1;
@@ -82,13 +82,13 @@ main (int argc, char *argv[])
           ACE_UNUSED_ARG (my_ex);
           ACE_DEBUG ((LM_DEBUG, "Client catches a TRANSIENT, as expected. No problem !\n"));
         }
-      
+
 
       hello->shutdown ();
-      
+
 
       orb->destroy ();
-      
+
     }
   catch (const CORBA::Exception& ex)
     {
@@ -96,7 +96,7 @@ main (int argc, char *argv[])
                            "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  
+
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
index 883b65c4fd2..af3e8b19669 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -94,7 +94,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
index 5d20406cd4f..f5e01d813c1 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -36,7 +36,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   CORBA::Boolean result = 0;
   try
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
index ed5ea7b35a8..99058035416 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -94,7 +94,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
index cd09f1a73d4..2d6418afb24 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
@@ -152,7 +152,7 @@ ClientTest::secure_invocation ()
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // Accomodate deficiencies on Windows that preclude doing this in
   // run_test.pl
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
index 3dc94c23308..c91fbcb8ba2 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -123,7 +123,7 @@ publish_ior (CORBA::ORB_ptr orb, CORBA::Object_ptr o, const char* filename)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // Necessary nonsense to make up for deficencies doing this
   // in run_test.pl on Windows platforms.