1 files changed, 21 insertions, 43 deletions

diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index e2423a851fc..86dd37c67f5 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -22,8 +22,6 @@
 #ifndef TAO_BE_DECL_H
 #define TAO_BE_DECL_H
 
-#include "ast_decl.h"
-
 class be_scope;
 class be_visitor;
 
@@ -65,37 +63,36 @@ public:
   virtual SIZE_TYPE size_type (void);
   // return our size type
 
-  const char *fullname (void);
+  const char *full_name (void);
   // return the stringified full name
 
-  const char *ami_handler_fullname (void);
-  // return the stringified full name of the assosciated AMI reply handler.
-
-  const char *flatname (void);
+  const char *flat_name (void);
   // return the flattened full scoped name.
 
-  const char *ami_handler_flatname (void);
-  // return the flattened full scoped name of the assosciated AMI reply handler.
+  const char *repoID (void);
+  // retrieve the repository ID.
 
-  char* compute_flatname (const char *prefix, const char *suffix);
+  // Methods used by the interface type strategy
+  void compute_full_name  (const char *prefix, 
+                           const char *suffix,
+                           char *&name);
   // Both the arguments should be non-null!!!. Applies prefix and
   // suffix to the local name and makes a flat name.
 
-  const char *repoID (void);
-  // retrieve the repository ID.
+  void compute_flat_name (const char *prefix, 
+                         const char *suffix,
+                         char *& name);
+  // Both the arguments should be non-null!!!. Applies prefix and
+  // suffix to the local name and makes a flat name.
 
-  const char *ami_handler_repoID (void);
-  // retrieve the repository ID of the assosciated AMI reply handler.
 
-  char *compute_repoID (const char *prefix, const char *suffix);
+  void compute_repoID (const char *prefix, 
+                       const char *suffix,
+                       char *& name);
   // Apply the prefix and suffix to the local name and compute the
   // repoID.  Both the parameters should be non-null.
 
-  int compute_ami_handler_name (const char *name,
-                                char *&ami_handler_name);
-  // Computes the name of the corresponding AMI handler out of a
-  // given name. The name might contain POA_ at the beginning
-  // and might possibly have many scope levels.
+  // End of Methods use by the interface type strategy
 
   const char* prefix (void);
   // retrieve the repository ID prefix
@@ -109,12 +106,6 @@ public:
   // Visiting
   virtual int accept (be_visitor *visitor);
 
-  idl_bool has_constructor (void);
-  // accessor for protected member.
-
-  void has_constructor (idl_bool value);
-  // mutator for protected member.
-
   // boolean methods to test if code was already generated
   idl_bool cli_hdr_gen (void);
   idl_bool cli_stub_gen (void);
@@ -158,13 +149,12 @@ protected:
   virtual int compute_size_type (void);
   // determine our size type and set it if it is unknown
 
-  virtual void compute_fullname (void);
+  virtual void compute_full_name (void);
   // computes the fully scoped name
 
-  virtual void compute_flatname (void);
+  virtual void compute_flat_name (void);
   // compute the flattened fully scoped name
 
-
   virtual void compute_repoID (void);
   // computes the repoID
 
@@ -187,33 +177,21 @@ protected:
   idl_bool cli_stub_cdr_op_gen_;
   idl_bool cli_inline_cdr_op_gen_;
 
-  char *fullname_;
+  char *full_name_;
   // our full scoped name
 
-  char *ami_handler_fullname_;
-  // our full scoped name of the associated AMI reply handler
-
-  char *flatname_;
+  char *flat_name_;
   // flattened fully scoped name
 
-  char *ami_handler_flatname_;
-  // flattened fully scoped name of the associated AMI reply handler
-
   char *repoID_;
   // repository ID
 
-  char *ami_handler_repoID_;
-  // repository ID of the associated AMI reply handler
-
   char *prefix_;
   // The repository ID prefix
 
   SIZE_TYPE size_type_;
   // whether we are fixed or variable size (by default fixed)
 
-  idl_bool has_constructor_;
-  // attribute that helps a union determine whether a member 
-  // should be included by value or by reference.
 };
 
 #endif // if !defined