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

18 files changed, 42 insertions, 56 deletions

diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index e4dc7055790..4d93a959480 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -107,9 +107,7 @@ Base_Server::start_orb_and_poa (void)
 {
   try
     {
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "");
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA");
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index b8d834eb382..6c4a6ceed3d 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -88,7 +88,7 @@ Client_Task::narrow_servant (void)
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (this->argc_, this->argv_, "");
+        CORBA::ORB_init (this->argc_, this->argv_);
 
       CORBA::Object_var object =
         orb->string_to_object (this->ior_);
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 13d80b781ce..8d1baba277f 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -37,14 +37,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+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/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 3ed0f81c74e..d4e3178773b 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -35,14 +35,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+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/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
index a714c274f5f..8242d38f01f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
@@ -16,16 +16,16 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[])
+ClientApp::run (int argc, char* argv[])
 {
   CORBA::ORB_var orb
-    = CORBA::ORB_init(argc, argv, "");
+    = CORBA::ORB_init (argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
index f7aec920724..f68024b161f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
@@ -22,15 +22,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[])
+ServerApp::run (int argc, char* argv[])
 {
-  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.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
index 0b30358473b..4a8e06402bd 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
@@ -25,15 +25,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[])
+ServerApp::run (int argc, char* argv[])
 {
-  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.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
index f4f861490d6..4e1a605ada8 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
@@ -16,16 +16,16 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[])
+ClientApp::run (int argc, char* argv[])
 {
   CORBA::ORB_var orb
-    = CORBA::ORB_init(argc, argv, "");
+    = CORBA::ORB_init (argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
index 8f488b1fe10..d177044eec6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
@@ -25,15 +25,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[])
+ServerApp::run (int argc, char* argv[])
 {
-  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.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
index 877a651de56..0109186ba8c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
@@ -26,15 +26,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[])
+ServerApp::run (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.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
index 86374211588..f98ed9aa094 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
@@ -22,16 +22,16 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[])
+ClientApp::run (int argc, char* argv[])
 {
   CORBA::ORB_var orb
-    = CORBA::ORB_init(argc, argv, "");
+    = CORBA::ORB_init (argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
index 25380861656..52afaffa234 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
@@ -30,15 +30,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[])
+ServerApp::run (int argc, char* argv[])
 {
-  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.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
index a9e90ec1351..171b523d0e8 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
@@ -16,16 +16,16 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[])
+ClientApp::run (int argc, char* argv[])
 {
   CORBA::ORB_var orb
-    = CORBA::ORB_init(argc, argv, "");
+    = CORBA::ORB_init (argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
index 4754d132955..2aea2f5a494 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
@@ -23,15 +23,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[])
+ServerApp::run (int argc, char* argv[])
 {
-  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.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int result = this->parse_args (argc, argv);
   if (result != 0)
     {
       return result;
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index a514cd4625e..f8f6e04e7f4 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -66,9 +66,7 @@ DT_Test::check_supported_priorities (void)
 int
 DT_Test::init (int argc, char *argv [])
 {
-  orb_ = CORBA::ORB_init (argc,
-                          argv,
-                          "");
+  orb_ = CORBA::ORB_init (argc, argv);
 
   this->check_supported_priorities ();
 
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index e223db89175..0e1e5862ce5 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -17,9 +17,7 @@ DT_Test::DT_Test (void)
 int
 DT_Test::init (int argc, char *argv [])
 {
-  orb_ = CORBA::ORB_init (argc,
-        argv,
-        "");
+  orb_ = CORBA::ORB_init (argc, argv);
 
   dt_creator_->orb (orb_.in ());
 
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index e8b9eeb82d9..16c8a0aff8a 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -119,13 +119,11 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list)
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+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);
 
       Starter starter (orb.in ());
 
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index 08e9bc9baa3..d89a688bec2 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -6,13 +6,11 @@
 
 ACE_RCSID(TypeCode_Creation, main, "$Id$")
 
-int main(int argc, char *argv[])
+int 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::TypeCode_var iface_tc =
         orb->create_interface_tc (CORBA::string_dup ("IDL:iface:1.0"),