ChangeLogTag: Thu Jun 19 14:11:00 UTC 2008 Simon Massey <sma at prismtech dot com>

20 files changed, 53 insertions, 56 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 1e98587dfd4..78e1c892883 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,27 @@
+Thu Jun 19 14:11:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * DAnCE/NodeApplication/NodeApplication_Core.cpp:
+        * DAnCE/NodeManager/Node_Manager.cpp:
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
+        * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp:
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp:
+        * examples/BasicSP/EC/client.cpp:
+        * examples/BasicSP/EC/controller.cpp:
+        * examples/Display/RateGen/controller.cpp:
+        * examples/Hello/Sender/starter.cpp:
+        * examples/Null_Component/StaticDAnCEApp.cpp:
+        * examples/Swapping/Sender/starter.cpp:
+        * performance-tests/Benchmark/Multi_Threaded/client.cpp:
+        * performance-tests/Benchmark/RoundTrip/client.cpp:
+        * performance-tests/Benchmark/RoundTripClient/client.cpp:
+        * performance-tests/Protocols/Receiver/Receiver_exec.cpp:
+        * performance-tests/Protocols/Sender/Sender_exec.cpp:
+        * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp:
+
+          Remove redundant "" 3rd parameter (orbID) from ORB_init() calls.
+
 Mon Jun 16 19:04:42 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * tools/Config_Handlers/Utils/Functors.h:
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
index de85c365c5f..dc4da51e397 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
@@ -188,9 +188,7 @@ CIAO::NodeApplication_Core::startup (int argc, char *argv[])
 
   // Initialize orb
   this->orb_ =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
+    CORBA::ORB_init (argc, argv);
   CIAO::Server_init (this->orb_.in ());
 
   return this->configurator_->post_orb_initialize (this->orb_.in ());
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index 6a92ed39278..8fc402d6701 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -163,15 +163,13 @@ register_with_ns (const char * name_context,
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       // Initialize orb
       // @@TODO: Add error checking. There is absoluteley none.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CIAO::Server_init (orb.in ());
 
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index 829a005f379..4365434bcc4 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -189,9 +189,7 @@ namespace CIAO
       try
         {
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc,
-                             argv,
-                             "");
+            CORBA::ORB_init (argc, argv);
 
           if (parse_args (argc, argv) == false)
             return -1;
diff --git a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
index f61a9f2a71e..91e01a8cb9d 100644
--- a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
@@ -42,8 +42,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                      "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
 
       Options* options = TheOptions::instance ();
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
index caa7e0a0f61..4f7a5ef45f8 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
@@ -41,9 +41,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   // Initialize the ORB so that CORBA::Any will work
   //
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
+    CORBA::ORB_init (argc, argv);
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"));
   int c;
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
index 177e7e11879..333c6911851 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
@@ -58,7 +58,7 @@ int main (int argc, char* argv[])
   {
     // initialize the ORB
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv,"");
+      CORBA::ORB_init (argc, argv);
 
 
     if (parse_args (argc, argv) != 0)
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
index c0e38131be3..3d22be9e12d 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
@@ -64,7 +64,7 @@ int main (int argc, char* argv[])
   {
     // initialize the ORB
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv,"");
+      CORBA::ORB_init (argc, argv);
 
     if (parse_args (argc, argv) != 0)
     {
diff --git a/CIAO/examples/BasicSP/EC/client.cpp b/CIAO/examples/BasicSP/EC/client.cpp
index 2788ea63634..80165cd827d 100644
--- a/CIAO/examples/BasicSP/EC/client.cpp
+++ b/CIAO/examples/BasicSP/EC/client.cpp
@@ -16,12 +16,12 @@
 #include "ace/OS_NS_unistd.h"
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve HomeFinder interface
 
diff --git a/CIAO/examples/BasicSP/EC/controller.cpp b/CIAO/examples/BasicSP/EC/controller.cpp
index 5f068f99fba..bd6c2bc3311 100644
--- a/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/CIAO/examples/BasicSP/EC/controller.cpp
@@ -70,14 +70,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {
diff --git a/CIAO/examples/Display/RateGen/controller.cpp b/CIAO/examples/Display/RateGen/controller.cpp
index 4b9d4f5166f..c6f5df82bdd 100644
--- a/CIAO/examples/Display/RateGen/controller.cpp
+++ b/CIAO/examples/Display/RateGen/controller.cpp
@@ -67,15 +67,13 @@ parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       // Initialize orb
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "");
+        CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {
diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp
index 4b839684ea1..d900973ba74 100644
--- a/CIAO/examples/Hello/Sender/starter.cpp
+++ b/CIAO/examples/Hello/Sender/starter.cpp
@@ -46,13 +46,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {
diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
index 2753ab41444..817119e4cc7 100644
--- a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
+++ b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
@@ -10,9 +10,7 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Initialize the ORB so that CORBA::Any will work.
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv,
-                                        "");
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
                                         
   try
   {
diff --git a/CIAO/examples/Swapping/Sender/starter.cpp b/CIAO/examples/Swapping/Sender/starter.cpp
index 7d04424a61f..c21c944f456 100644
--- a/CIAO/examples/Swapping/Sender/starter.cpp
+++ b/CIAO/examples/Swapping/Sender/starter.cpp
@@ -48,13 +48,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index 7b6d4f6462d..c684bcc1ebe 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -24,15 +24,13 @@ const char *ior4 = "file://comp4.ior";
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj1
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 2b708dbf74d..c4f9393a147 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -83,7 +83,7 @@ set_priority ()
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -91,9 +91,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       set_priority();
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args(argc, argv) == -1)
         {
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index 61b730a2339..5d75029d1bb 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -18,15 +18,13 @@
 const char *ior = "file://test.ior";
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
index 2133cc6f69c..a685d9db91c 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
@@ -218,9 +218,7 @@ namespace CIDL_ReceiverImpl
     char **argv = 0;
 
     this->orb_ =
-      CORBA::ORB_init (argc,
-                      argv,
-                      "");
+      CORBA::ORB_init (argc, argv);
 
   }
 
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index 6a18dc61fc9..87eaa8b938e 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -582,9 +582,7 @@ CIDL_SenderImpl::SenderExec_i::start (
   char **argv = 0;
 
   this->orb_ =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
+    CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTORB");
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
index 6e7d40bcea5..20f5651cf16 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
@@ -118,9 +118,9 @@ main
   {
     // Initialize orb
     CORBA::ORB_var orb =
-                        CORBA::ORB_init( argc, argv, "" );
+                        CORBA::ORB_init (argc, argv);
 
-    if( parse_args( argc, argv ) != 0 )
+    if( parse_args (argc, argv) != 0 )
     {
       return -1;
     }