Thu Jun 19 16:43:52 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

24 files changed, 24 insertions, 30 deletions

diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index ec1ab8dfec3..3c906616160 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -289,7 +289,7 @@ int main (int argc, char *argv[])
     return 1;
 
   ST_AMH_Server amh_server (&argc, argv);
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
 
   amh_server.start_orb_and_poa(orb);
diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp
index f81e3a1e6fe..43f38da74e9 100644
--- a/TAO/tests/Bug_2429_Regression/server.cpp
+++ b/TAO/tests/Bug_2429_Regression/server.cpp
@@ -38,8 +38,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
-                         argv,
-                         "");
+                         argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/Bug_2560_Regression/client.cpp b/TAO/tests/Bug_2560_Regression/client.cpp
index 2ee280d5435..861337c6273 100644
--- a/TAO/tests/Bug_2560_Regression/client.cpp
+++ b/TAO/tests/Bug_2560_Regression/client.cpp
@@ -10,7 +10,7 @@ int main (int argc, char* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
-    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" );
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
     // There must be at least two arguments, the first is the factory
     // name, the rest are the names of the stock symbols we want to
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index fdd9836f70d..70f39cf64aa 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -60,7 +60,7 @@ ClientApp::run_i(int argc, char* argv[])
 int
 ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "");
+  this->orb_ = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index 4d4f7b2af52..4a7bba63edb 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -62,7 +62,7 @@ ServerApp::run_i(int argc, char* argv[])
 int
 ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "");
+  this->orb_ = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
index 53680a6cd93..f8ee344d8ad 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
@@ -22,7 +22,7 @@ int
 ClientApp::run_i(int argc, char* argv[])
 {
   // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
index 5c4c0603584..8b5bac20c68 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
@@ -27,7 +27,7 @@ int
 ServerApp::run_i(int argc, char* argv[])
 {
   // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index cd2c1607b6b..f3cca377e09 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -40,7 +40,7 @@ ClientApp::run_i(int argc, char* argv[])
 int
 ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "");
+  this->orb_ = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index a889a00c118..c8ce431465d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -60,7 +60,7 @@ ServerApp::run_i(int argc, char* argv[])
 int
 ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "");
+  this->orb_ = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index ef9a37a5987..613424ca06e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -60,7 +60,7 @@ ClientApp::run_i(int argc, char* argv[])
 int
 ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "");
+  this->orb_ = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 17e721f012d..4f9bd9775bb 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -74,7 +74,7 @@ ServerApp::run_i(int argc, char* argv[])
 int
 ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "");
+  this->orb_ = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index b05afba0e29..cb7e0fa4d76 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -42,7 +42,7 @@ ClientApp::run_i(int argc, char* argv[])
 int
 ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "");
+  this->orb_ = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 00e668c62bc..544be32c0ed 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -62,7 +62,7 @@ ServerApp::run_i(int argc, char* argv[])
 int
 ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "");
+  this->orb_ = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
index 996275e4897..4dd68f773c4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
@@ -25,7 +25,7 @@ int
 ClientApp::run_i(int argc, char* argv[])
 {
   // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
index 58ecddfcf36..103f9eae539 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
@@ -25,7 +25,7 @@ int
 ServerApp::run_i(int argc, char* argv[])
 {
   // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
diff --git a/TAO/tests/DII_AMI_Forward/server.cpp b/TAO/tests/DII_AMI_Forward/server.cpp
index 5fd3ccbc9d5..061f9e3042e 100644
--- a/TAO/tests/DII_AMI_Forward/server.cpp
+++ b/TAO/tests/DII_AMI_Forward/server.cpp
@@ -56,7 +56,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       PortableInterceptor::register_orb_initializer (initializer.in ());
 
       // Now initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
 
diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp
index 5aec557694b..79309f3e6ad 100644
--- a/TAO/tests/Explicit_Event_Loop/client.cpp
+++ b/TAO/tests/Explicit_Event_Loop/client.cpp
@@ -35,8 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+                                            argv);
 
       // Check arguments.
       if  (argc != 2)
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index e1742a4ef2e..22ba8bd5b3d 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -92,8 +92,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+                                            argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/LongDouble/client.cpp b/TAO/tests/LongDouble/client.cpp
index 7b47df53609..5611aced364 100644
--- a/TAO/tests/LongDouble/client.cpp
+++ b/TAO/tests/LongDouble/client.cpp
@@ -43,7 +43,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp
index bcc26cf50da..eeac97ff234 100644
--- a/TAO/tests/LongDouble/server.cpp
+++ b/TAO/tests/LongDouble/server.cpp
@@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp
index ffe8ca7b1f9..a89d07632bf 100644
--- a/TAO/tests/ORB_init/Portspan/server.cpp
+++ b/TAO/tests/ORB_init/Portspan/server.cpp
@@ -8,7 +8,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
     {
 
-      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
 
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index 571c43f2a10..6ad136dcfe5 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -41,8 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       CORBA::ORB_var orb  =
         CORBA::ORB_init (argc,
-                         argv,
-                         "");
+                         argv);
 
       if (parse_args (argc, argv) == -1)
         return -1;
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 931ed94ae84..0658014a8bd 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -149,8 +149,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Initialize the broker
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
-                         argv,
-                         "");
+                         argv);
 
       CORBA::Object_var vRootPOABase =
         orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
index f30d5eaedff..a2cacd867ff 100644
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ b/TAO/tests/Permanent_Forward/StubTest.cpp
@@ -328,8 +328,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+                                            argv);
 
       test_forward (orb.in());
       test_forward_permanent (orb.in());