ChangeLogTag:Mon Feb 16 20:01:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

6 files changed, 28 insertions, 16 deletions

diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
index 4d69d03eb17..59261ad4511 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
@@ -26,14 +26,14 @@ Receiver_Impl::Receiver_exec_i::push_click_in (Hello::timeout *
               "Receiver - Informed by the Sender \n"));
 
   Hello::message_var rev
-    = this->context_->get_connection_read_message (ACE_ENV_ARG_PARAMETER);
+    = this->context_->get_connection_read_message (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (rev.in ()))
     ACE_THROW (CORBA::BAD_INV_ORDER ());
 
   CORBA::String_var str =
-    rev->get_message (ACE_ENV_ARG_PARAMETER);
+    rev->get_message (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
index b97af06aa73..313fd219b94 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -28,21 +28,21 @@ Sender_Impl::Sender_exec_i::~Sender_exec_i ()
 
 void
 Sender_Impl::Sender_exec_i::local_message (const char * local_message
-		       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+		                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   message_ = CORBA::string_dup (local_message);
 }
 
 char *
-Sender_Impl::Sender_exec_i::local_message (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+Sender_Impl::Sender_exec_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(message_);
 }
 
 Hello::CCM_message_ptr
-Sender_Impl::Sender_exec_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL)
+Sender_Impl::Sender_exec_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec.i::get_push_message called\n "));
@@ -65,7 +65,7 @@ Sender_Impl::Sender_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
 // Operations from Components::SessionComponen
 void
 Sender_Impl::Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -120,7 +120,7 @@ Sender_Impl::SenderHome_exec_i::~SenderHome_exec_i ()
 }
 
 ::Components::EnterpriseComponent_ptr
-Sender_Impl::SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
+Sender_Impl::SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/TAO/CIAO/examples/Hello/Sender/starter.cpp b/TAO/CIAO/examples/Hello/Sender/starter.cpp
index c4f4fdd91a6..9f052fa5816 100644
--- a/TAO/CIAO/examples/Hello/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/starter.cpp
@@ -49,7 +49,12 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
+		                            argv,
+					    ""
+					    ACE_ENV_ARG_PARAMETER);
+
+      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -61,14 +66,15 @@ main (int argc, char *argv[])
 
       Hello::Sender_var sender
         = Hello::Sender::_narrow (obj.in ()
-				    ACE_ENV_ARG_PARAMETER);
+			          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (sender.in ()))
         ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire Sender's objref\n"), -1);
 
       sender->local_message (message);
-      sender->start (ACE_ENV_ARG_PARAMETER);
+
+      sender->start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
index 2d404640c7f..d673037efcd 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
@@ -181,7 +181,7 @@ MyImpl::EC_exec_i::active (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -189,7 +189,7 @@ MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx
 
   this->context_ =
     BasicSP::CCM_EC_Context::_narrow (ctx
-                                             ACE_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->context_.in ()))
@@ -256,14 +256,14 @@ MyImpl::ECHome_exec_i::~ECHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::ECHome_exec_i::new_EC (CORBA::Long hertz
-                               ACE_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return new MyImpl::EC_exec_i (hertz);
 }
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::ECHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::ECHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp
index f176603b078..1ecfeb54974 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp
@@ -19,7 +19,9 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""
+		                            ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       // Resolve HomeFinder interface
 
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp
index 1bfbbaf8a8c..7d10c93e930 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp
@@ -68,7 +68,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
+		                            argv,
+					    ""
+					    ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;