ChangeLogTag: Thu Jan 25 18:18:58 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 34 insertions, 66 deletions

diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
index a50fee30538..3aca5735ae0 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
@@ -45,26 +45,23 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::set_session_context (
-  ::Components::SessionContext_ptr ctx
-  ACE_ENV_ARG_DECL)
+  ::Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
   {
     this->context_ =
     Receiver_Context::_narrow (
-    ctx
-    ACE_ENV_ARG_PARAMETER);
+    ctx);
 
     if (this->context_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   }
 
   void
-  Receiver_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -73,8 +70,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -83,8 +79,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_activate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -93,8 +88,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_passivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -103,8 +97,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_remove (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -135,8 +128,7 @@ namespace CIDL_Receiver_Impl
   // Implicit operations.
 
   ::Components::EnterpriseComponent_ptr
-  ReceiverHome_exec_i::create (
-  ACE_ENV_SINGLE_ARG_DECL)
+  ReceiverHome_exec_i::create ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
index fa366a6c10d..a90c6941de7 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
@@ -52,43 +52,37 @@ namespace CIDL_Receiver_Impl
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
@@ -116,8 +110,7 @@ namespace CIDL_Receiver_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.cpp b/CIAO/tests/Minimum/Sender/Sender_exec.cpp
index c877f3a9729..b8b1a1c516e 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec.cpp
+++ b/CIAO/tests/Minimum/Sender/Sender_exec.cpp
@@ -38,8 +38,7 @@ namespace CIDL_Sender_Impl
   // Supported or inherited operations.
 
   void
-  Sender_exec_i::bar (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::bar ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
@@ -53,26 +52,23 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::set_session_context (
-  ::Components::SessionContext_ptr ctx
-  ACE_ENV_ARG_DECL)
+  ::Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
   {
     this->context_ =
     Sender_Context::_narrow (
-    ctx
-    ACE_ENV_ARG_PARAMETER);
+    ctx);
 
     if (this->context_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   }
 
   void
-  Sender_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -81,8 +77,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -91,8 +86,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_activate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -101,8 +95,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_passivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -111,8 +104,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_remove (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -143,8 +135,7 @@ namespace CIDL_Sender_Impl
   // Implicit operations.
 
   ::Components::EnterpriseComponent_ptr
-  SenderHome_exec_i::create (
-  ACE_ENV_SINGLE_ARG_DECL)
+  SenderHome_exec_i::create ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.h b/CIAO/tests/Minimum/Sender/Sender_exec.h
index 984586924f6..179bb6453a8 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec.h
+++ b/CIAO/tests/Minimum/Sender/Sender_exec.h
@@ -45,8 +45,7 @@ namespace CIDL_Sender_Impl
     // Supported or inherited operations.
 
     virtual void
-    bar (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    bar ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Attribute operations.
@@ -57,43 +56,37 @@ namespace CIDL_Sender_Impl
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
@@ -121,8 +114,7 @@ namespace CIDL_Sender_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));