ChangeLogTag: Thu Jan 25 19:56:33 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

11 files changed, 11 insertions, 18 deletions

diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index 2e9a087808f..b1331a60f77 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
@@ -18,7 +18,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 char*
-Simple_Server_i::remote_call ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Simple_Server_i::remote_call (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in()));
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 4dfc4d3c0ed..bbe23477614 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 void
-Simple_Server_i::remote_call ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Simple_Server_i::remote_call (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index 3b18b67811b..dc7f9f97136 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -22,7 +22,7 @@ Callback_i::shutdown (void)
 }
 
 void
-Callback_i::callback_method ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 701d0cfebde..da30915c6a8 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -75,8 +75,7 @@ Notify_Structured_Push_Consumer::_connect (
 
 void
 Notify_Structured_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
- /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index 8db3752f153..3cb7e10ff34 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -57,8 +57,7 @@ Notify_Structured_Push_Consumer::_connect (
 
 void
 Notify_Structured_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
- /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index bf73bb28e86..856843f7660 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -18,8 +18,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 
 void
 Notify_Structured_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& /*event*/
- /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::StructuredEvent& /*event*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index b7e195e7b23..5fb18be9cff 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -70,8 +70,7 @@ Notify_Sequence_Push_Consumer::_connect (
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
-  const CosNotification::EventBatch& events
- /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (count_ == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 28d24e55e39..4ed908f305e 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -64,8 +64,7 @@ Notify_Structured_Push_Consumer::_connect (
 
 void
 Notify_Structured_Push_Consumer::push_structured_event (
-                          const CosNotification::StructuredEvent& event
- /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+                          const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index 219e33382b6..cc6a64df10a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -55,8 +55,7 @@ Notify_Sequence_Push_Consumer::_connect (
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
-  const CosNotification::EventBatch& events
- /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->count_ == 0 )
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index 4f96edaaa6c..31b8c3b6e0a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -49,8 +49,7 @@ Notify_Structured_Push_Consumer::_connect (
 
 void
 Notify_Structured_Push_Consumer::push_structured_event(
-                          const CosNotification::StructuredEvent& /*event*/
- /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+                          const CosNotification::StructuredEvent& /*event*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->count_ == 0 )
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index e1f06c3ef6a..cac6e66f604 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -22,7 +22,7 @@ Callback_i::shutdown (void)
 }
 
 void
-Callback_i::callback_method ( /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)