ChangeLogTag: Wed Aug 23 11:53:43 2000 Jeff Parsons <parsons@cs.wustl.edu>

1 files changed, 94 insertions, 64 deletions

diff --git a/TAO/TAO_IDL/be/be_operation_strategy.cpp b/TAO/TAO_IDL/be/be_operation_strategy.cpp
index a50793338b6..a62a342eab4 100644
--- a/TAO/TAO_IDL/be/be_operation_strategy.cpp
+++ b/TAO/TAO_IDL/be/be_operation_strategy.cpp
@@ -31,32 +31,33 @@ be_operation_strategy::be_operation_strategy (be_operation *node,
 {
 }
 
-be_operation_strategy::~be_operation_strategy ()
+be_operation_strategy::~be_operation_strategy (void)
 {
 }
 
 int
-be_operation_strategy::strategy_type ()
+be_operation_strategy::strategy_type (void)
 {
   return strategy_type_;
 }
 
 int 
-be_operation_strategy::has_extra_code_generation (TAO_CodeGen::CG_STATE current_state)
+be_operation_strategy::has_extra_code_generation (
+    TAO_CodeGen::CG_STATE /* current_state */
+  )
 {
-  ACE_UNUSED_ARG (current_state);
   return 0;
 }
 
 be_operation *
-be_operation_strategy::marshaling ()
+be_operation_strategy::marshaling (void)
 {
   return 0;
 }
 
 
 be_operation *
-be_operation_strategy::arguments ()
+be_operation_strategy::arguments (void)
 {
   return 0;
 }
@@ -64,22 +65,25 @@ be_operation_strategy::arguments ()
 // ****************************************************************
 // AMI sendc_ operation strategy
 
-be_operation_default_strategy::be_operation_default_strategy (be_operation *node)
+be_operation_default_strategy::be_operation_default_strategy (
+    be_operation *node
+  )
   : be_operation_strategy (node, 
                            DEFAULT)
 {
 }
 
-be_operation_default_strategy::~be_operation_default_strategy ()
+be_operation_default_strategy::~be_operation_default_strategy (void)
 {
 }
 
 
 TAO_CodeGen::CG_STATE
-be_operation_default_strategy::next_state (TAO_CodeGen::CG_STATE current_state,
-                                           int is_extra_state)
+be_operation_default_strategy::next_state (
+    TAO_CodeGen::CG_STATE current_state,
+    int /* is_extra_state */
+  )
 {
-  ACE_UNUSED_ARG (is_extra_state);
   return current_state;
 }
 
@@ -88,9 +92,11 @@ be_operation_default_strategy::next_state (TAO_CodeGen::CG_STATE current_state,
 // ****************************************************************
 // AMI sendc_ operation strategy
 
-be_operation_ami_sendc_strategy::be_operation_ami_sendc_strategy (be_operation *node,
-                                                                  be_operation *marshaling,
-                                                                  be_operation *arguments)
+be_operation_ami_sendc_strategy::be_operation_ami_sendc_strategy (
+    be_operation *node,
+    be_operation *marshaling,
+    be_operation *arguments
+  )
   : be_operation_strategy (node, 
                            AMI_SENDC),
     marshaling_ (marshaling),
@@ -98,53 +104,61 @@ be_operation_ami_sendc_strategy::be_operation_ami_sendc_strategy (be_operation *
 {
 }
 
-be_operation_ami_sendc_strategy::~be_operation_ami_sendc_strategy ()
+be_operation_ami_sendc_strategy::~be_operation_ami_sendc_strategy (void)
 {
 }
 
 
 TAO_CodeGen::CG_STATE
-be_operation_ami_sendc_strategy::next_state (TAO_CodeGen::CG_STATE current_state,
-                                             int is_extra_state)
+be_operation_ami_sendc_strategy::next_state (
+    TAO_CodeGen::CG_STATE current_state,
+    int is_extra_state
+  )
 {
   if (is_extra_state)
     {
       switch (current_state)
-        {
-      case TAO_CodeGen::TAO_OPERATION_CH:
-        return TAO_CodeGen::TAO_AMI_SENDC_OPERATION_CH;
-      case TAO_CodeGen::TAO_OPERATION_CS:
-        return TAO_CodeGen::TAO_AMI_SENDC_OPERATION_CS;
-      default:
-        return current_state;
-        }
+      {
+        case TAO_CodeGen::TAO_OPERATION_CH:
+          return TAO_CodeGen::TAO_AMI_SENDC_OPERATION_CH;
+        case TAO_CodeGen::TAO_OPERATION_CS:
+          return TAO_CodeGen::TAO_AMI_SENDC_OPERATION_CS;
+        default:
+          return current_state;
+      }
     }
-  else  // !is_extra_state
+  else 
     {
       return current_state;
     }
 }
 
 int 
-be_operation_ami_sendc_strategy::has_extra_code_generation (TAO_CodeGen::CG_STATE current_state)
+be_operation_ami_sendc_strategy::has_extra_code_generation (
+    TAO_CodeGen::CG_STATE current_state
+  )
 {
-   if (current_state == TAO_CodeGen::TAO_OPERATION_CH
-    || current_state == TAO_CodeGen::TAO_OPERATION_CS)
-     return 1;
-   else
-     return 0;
+  if (current_state == TAO_CodeGen::TAO_OPERATION_CH
+       || current_state == TAO_CodeGen::TAO_OPERATION_CS)
+    { 
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
 }
 
 
 be_operation*
-be_operation_ami_sendc_strategy::marshaling ()
+be_operation_ami_sendc_strategy::marshaling (void)
 {
   return marshaling_;
 }
 
 
 be_operation*
-be_operation_ami_sendc_strategy::arguments ()
+be_operation_ami_sendc_strategy::arguments (void)
 {
   return arguments_;
 }
@@ -152,69 +166,79 @@ be_operation_ami_sendc_strategy::arguments ()
 // ****************************************************************
 // AMI ExceptionHolder raise_ operation strategy
 
-be_operation_ami_exception_holder_raise_strategy::be_operation_ami_exception_holder_raise_strategy (be_operation *node)
+be_operation_ami_exception_holder_raise_strategy
+::be_operation_ami_exception_holder_raise_strategy (be_operation *node)
   : be_operation_strategy (node, 
                            AMI_EXCEPTION_HOLDER_RAISE)
 {
 }
 
-be_operation_ami_exception_holder_raise_strategy::~be_operation_ami_exception_holder_raise_strategy ()
+be_operation_ami_exception_holder_raise_strategy
+::~be_operation_ami_exception_holder_raise_strategy (void)
 {
 }
 
 
 TAO_CodeGen::CG_STATE
-be_operation_ami_exception_holder_raise_strategy::next_state (TAO_CodeGen::CG_STATE current_state,
-                                                              int is_extra_state)
+be_operation_ami_exception_holder_raise_strategy::next_state (
+    TAO_CodeGen::CG_STATE current_state,
+    int is_extra_state
+  )
 {
   if (!is_extra_state)
     {
       switch (current_state)
-        {
-      case TAO_CodeGen::TAO_OPERATION_CS:
-        return TAO_CodeGen::TAO_AMI_EXCEPTION_HOLDER_RAISE_OPERATION_CS;
-      default:
-        return current_state;
-        }
+      {
+        case TAO_CodeGen::TAO_OPERATION_CS:
+          return TAO_CodeGen::TAO_AMI_EXCEPTION_HOLDER_RAISE_OPERATION_CS;
+        default:
+          return current_state;
+      }
     }
   else
-    return current_state;
+    {
+      return current_state;
+    }
 }
 
 
 // ****************************************************************
 // AMI Reply Handler reply stub operation strategy
 
-be_operation_ami_handler_reply_stub_strategy::be_operation_ami_handler_reply_stub_strategy (be_operation *node)
+be_operation_ami_handler_reply_stub_strategy
+::be_operation_ami_handler_reply_stub_strategy (be_operation *node)
   : be_operation_strategy (node, 
                            AMI_EXCEPTION_HOLDER_RAISE)
 {
 }
 
-be_operation_ami_handler_reply_stub_strategy::~be_operation_ami_handler_reply_stub_strategy ()
+be_operation_ami_handler_reply_stub_strategy
+::~be_operation_ami_handler_reply_stub_strategy (void)
 {
 }
 
 
 TAO_CodeGen::CG_STATE
-be_operation_ami_handler_reply_stub_strategy::next_state (TAO_CodeGen::CG_STATE current_state,
-                                                          int is_extra_state)
+be_operation_ami_handler_reply_stub_strategy::next_state (
+    TAO_CodeGen::CG_STATE current_state,
+    int is_extra_state
+  )
 {
   if (is_extra_state)
     {
       switch (current_state)
-        {
-      case TAO_CodeGen::TAO_OPERATION_CH:
-        return TAO_CodeGen::TAO_AMI_HANDLER_REPLY_STUB_OPERATION_CH;
+      {
+        case TAO_CodeGen::TAO_OPERATION_CH:
+          return TAO_CodeGen::TAO_AMI_HANDLER_REPLY_STUB_OPERATION_CH;
 
-      case TAO_CodeGen::TAO_OPERATION_CS:
-        return TAO_CodeGen::TAO_AMI_HANDLER_REPLY_STUB_OPERATION_CS;
+        case TAO_CodeGen::TAO_OPERATION_CS:
+          return TAO_CodeGen::TAO_AMI_HANDLER_REPLY_STUB_OPERATION_CS;
 
-      default:
-        return current_state;
-        }  
+        default:
+          return current_state;
+      }  
     }
-  else  // !is_extra_state
+  else
     {
       return current_state;
     }
@@ -222,12 +246,18 @@ be_operation_ami_handler_reply_stub_strategy::next_state (TAO_CodeGen::CG_STATE
 
 
 int 
-be_operation_ami_handler_reply_stub_strategy::has_extra_code_generation (TAO_CodeGen::CG_STATE current_state)
+be_operation_ami_handler_reply_stub_strategy::has_extra_code_generation (
+    TAO_CodeGen::CG_STATE current_state
+  )
 {
-   if (current_state == TAO_CodeGen::TAO_OPERATION_CH
-    || current_state == TAO_CodeGen::TAO_OPERATION_CS)
-     return 1;
-   else
-     return 0;
+  if (current_state == TAO_CodeGen::TAO_OPERATION_CH
+       || current_state == TAO_CodeGen::TAO_OPERATION_CS)
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
 }