ChangeLogTag: Wed Apr 28 01:51:18 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

1 files changed, 20 insertions, 44 deletions

diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp
index 7caa058666a..14fe829e7ec 100644
--- a/TAO/TAO_IDL/be/be_operation.cpp
+++ b/TAO/TAO_IDL/be/be_operation.cpp
@@ -15,7 +15,6 @@
 //=============================================================================
 
 #include "be_operation.h"
-#include "be_operation_strategy.h"
 #include "be_predefined_type.h"
 #include "be_argument.h"
 #include "be_visitor.h"
@@ -45,11 +44,10 @@ be_operation::be_operation (AST_Type *rt,
     be_scope (AST_Decl::NT_op),
     be_decl (AST_Decl::NT_op,
              n),
-    original_operation_ (0)
+    is_sendc_ami_ (false),
+    is_excep_ami_ (false),
+    is_attr_op_ (false)
 {
-  ACE_NEW (this->strategy_,
-           be_operation_default_strategy (this));
-
   if (this->imported ())
     {
       return;
@@ -66,7 +64,6 @@ be_operation::be_operation (AST_Type *rt,
     }
 }
 
-
 be_operation::~be_operation (void)
 {
 }
@@ -74,13 +71,6 @@ be_operation::~be_operation (void)
 void
 be_operation::destroy (void)
 {
-  if (0 != this->strategy_)
-    {
-      this->strategy_->destroy ();
-      delete this->strategy_;
-      this->strategy_ = 0;
-    }
-
   // Call the destroy methods of our base classes.
   this->be_scope::destroy ();
   this->be_decl::destroy ();
@@ -115,54 +105,40 @@ be_operation::be_insert_exception (AST_Exception *ex)
   return 0;
 }
 
-be_operation_strategy *
-be_operation::set_strategy (be_operation_strategy *new_strategy)
+bool
+be_operation::is_sendc_ami (void) const
 {
-  be_operation_strategy *old = this->strategy_;
-
-  if (new_strategy != 0)
-    {
-      this->strategy_ = new_strategy;
-    }
-
-  return old;
+  return this->is_sendc_ami_;
 }
 
-TAO_CodeGen::CG_STATE
-be_operation::next_state (TAO_CodeGen::CG_STATE current_state,
-                          int is_extra_state)
+void
+be_operation::is_sendc_ami (bool val)
 {
-  return this->strategy_->next_state (current_state, is_extra_state);
+  this->is_sendc_ami_ = val;
 }
 
-int
-be_operation::has_extra_code_generation (TAO_CodeGen::CG_STATE current_state)
+bool
+be_operation::is_excep_ami (void) const
 {
-  return this->strategy_->has_extra_code_generation (current_state);
+  return this->is_excep_ami_;
 }
 
-be_operation*
-be_operation::marshaling (void)
+void
+be_operation::is_excep_ami (bool val)
 {
-  return this->strategy_->marshaling ();
+  this->is_excep_ami_ = val;
 }
 
-be_operation*
-be_operation::arguments (void)
+bool
+be_operation::is_attr_op (void) const
 {
-  return this->strategy_->arguments ();
+  return this->is_attr_op_;
 }
 
 void
-be_operation::original_operation (be_operation *original_operation)
-{
-  this->original_operation_ = original_operation;
-}
-
-be_operation *
-be_operation::original_operation (void)
+be_operation::is_attr_op (bool val)
 {
-  return this->original_operation_;
+  this->is_attr_op_ = val;
 }
 
 IMPL_NARROW_FROM_DECL (be_operation)