Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl>

        Merged changes from Remedy work branch.

11 files changed, 4 insertions, 266 deletions

diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h
index 0122cdb0f15..07a91da0ed4 100644
--- a/TAO/TAO_IDL/be_include/be_component.h
+++ b/TAO/TAO_IDL/be_include/be_component.h
@@ -77,9 +77,6 @@ public:
   /// Generate the string compares for ancestors in _is_a().
   virtual int gen_is_a_ancestors (TAO_OutStream *os);
 
-  /// Generate setup_collocation() for base component, if any.
-  virtual void gen_parent_collocation (TAO_OutStream *os);
-
   // Narrowing.
 
   DEF_NARROW_FROM_DECL (be_component);
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index cdb382f7526..4838d0b77ff 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -766,10 +766,6 @@ public:
   /// Cleanup function.
   void destroy (void);
 
-  /// Used in the generation of declarations for
-  /// xxx_Proxy_Broker_Factory_function_pointer.
-  ACE_Unbounded_Queue<be_interface *> non_local_interfaces;
-
   /// Used in the generation of extern function declarations so we
   /// can use non-defined interfaces as members and parameters.
   ACE_Unbounded_Queue<be_interface_fwd *> non_defined_interfaces;
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 2591251a3b8..65bb4bec8ee 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -69,20 +69,6 @@ public:
   /// Retrieve the fully qualified collocated class name.
   const char *local_coll_name (int);
 
-  /// retrieve the name of the base proxy implementation.
-  virtual const char *base_proxy_impl_name (void);
-
-  /// retrieve the fully qualified name of the base proxy
-  /// implementation.
-  virtual const char *full_base_proxy_impl_name (void);
-
-  /// retrieve the name of the remote  proxy implementation.
-  virtual const char *remote_proxy_impl_name (void);
-
-  /// retrieve the fully qualified name of the remote
-  /// proxy implementation.
-  virtual const char *full_remote_proxy_impl_name (void);
-
   /// retrieve the name of the direct proxy implementation.
   virtual const char *direct_proxy_impl_name (void);
 
@@ -90,26 +76,6 @@ public:
   /// implementation.
   virtual const char *full_direct_proxy_impl_name (void);
 
-  /// retrieve the name of the base proxy broker.
-  virtual const char *base_proxy_broker_name (void);
-
-  /// retrieve the fully qualified name of the base proxy broker.
-  virtual const char *full_base_proxy_broker_name (void);
-
-  /// retrieve the name of the remote  proxy broker implementation.
-  virtual const char *remote_proxy_broker_name (void);
-
-  /// retrieve the fully qualified name of the remote  proxy broker
-  /// implementation.
-  virtual const char *full_remote_proxy_broker_name (void);
-
-  /// retrieve the name of the strategized proxy broker implementation.
-  virtual const char *strategized_proxy_broker_name (void);
-
-  /// retrieve the fully qualified name of the strategized proxy broker
-  /// implementation.
-  virtual const char *full_strategized_proxy_broker_name (void);
-
   /// Return the client scope that encloses the interface.
   virtual const char *client_enclosing_scope (void);
 
@@ -344,9 +310,6 @@ public:
   /// Generate the string compares for ancestors in _is_a().
   virtual int gen_is_a_ancestors (TAO_OutStream *os);
 
-  /// Generate setup_collocation() for base component, if any.
-  virtual void gen_parent_collocation (TAO_OutStream *os);
-
 protected:
   /**
    * CDreate a new string made by the concatenation
@@ -362,16 +325,12 @@ protected:
   enum Suffix_Code
   {
     PROXY_IMPL = 0,
-    PROXY_BROKER = 1
   };
 
   enum Tag_Code
   {
-    THRU_POA = 0,
-    DIRECT = 1,
-    REMOTE = 2,
-    STRATEGIZED = 3,
-    GC_PREFIX = 4 // Prefix used for the generated class
+    DIRECT = 0,
+    GC_PREFIX = 1 // Prefix used for the generated class
                   // This prefix is used to avoid name conflicts
                   // with the user classes.
   };
@@ -380,23 +339,10 @@ protected:
   static const char *tag_table_[];
 
   // Proxy Implementation names.
-  char *base_proxy_impl_name_;
-  char *remote_proxy_impl_name_;
   char *direct_proxy_impl_name_;
 
-  char *full_base_proxy_impl_name_;
-  char *full_remote_proxy_impl_name_;
   char *full_direct_proxy_impl_name_;
 
-  // Proxy Broker Names.
-  char *base_proxy_broker_;
-  char *remote_proxy_broker_;
-  char *strategized_proxy_broker_;
-
-  char *full_base_proxy_broker_name_;
-  char *full_remote_proxy_broker_name_;
-  char *full_strategized_proxy_broker_name_;
-
   char *client_scope_;
   char *flat_client_scope_;
 
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index c92b4952dcd..ae090cbc735 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -126,12 +126,6 @@ public:
                                        be_interface *base,
                                        TAO_OutStream *os);
 
-  /// Helper method to generate *_skel operations for the concrete
-  /// interface that we support (if any) and those of its base classes.
-  static int gen_skel_helper (be_interface *node,
-                              be_interface *base,
-                              TAO_OutStream *os);
-
   /// Accessor to the member.
   const char *fwd_helper_name (void) const;
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index 516196294a6..740fa08dcae 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -42,10 +42,6 @@
 #include "be_visitor_interface/smart_proxy_ch.h"
 #include "be_visitor_interface/smart_proxy_cs.h"
 
-// Proxy Brokers
-#include "be_visitor_interface/strategized_proxy_broker_sh.h"
-#include "be_visitor_interface/strategized_proxy_broker_ss.h"
-
 // Proxy Impls
 #include "be_visitor_interface/direct_proxy_impl_sh.h"
 #include "be_visitor_interface/direct_proxy_impl_ss.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h
index bbd8e6723c4..77eb09dc377 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h
@@ -21,11 +21,11 @@ public:
 
   int visit_interface (be_interface *node);
 
+  // Helper method passed to the template method to generate code for the
+  // AMH skeletons in the inline files.
   static int gen_skel_helper (be_interface *,
                               be_interface *,
                               TAO_OutStream *);
-  // Helper method passed to the template method to generate code for the
-  // AMH skeletons in the inline files.
 };
 
 #endif /* AMH_SH_I_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h
deleted file mode 100644
index 36d89682895..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//=============================================================================
-/**
- *  @file    strategized_proxy_broker_sh.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor generates the declaration for the strategized
- *   ProxyBroker class.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef BE_STRATEGIZED_PROXY_BROKER_SH_H_
-#define BE_STRATEGIZED_PROXY_BROKER_SH_H_
-
-/**
- * @class be_visitor_interface_strategized_proxy_broker_sh
- *
- * @brief Generates the declaration for the base proxy
- * broker class.
- */
-class be_visitor_interface_strategized_proxy_broker_sh : public be_visitor_interface
-{
-
-public:
-  // -- Ctor/Dtor Decl. --
-  be_visitor_interface_strategized_proxy_broker_sh (be_visitor_context *ctx);
-
-  virtual ~be_visitor_interface_strategized_proxy_broker_sh (void);
-
-  /// visit an interface
-  virtual int visit_interface (be_interface *node);
-
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
-  virtual int visit_component (be_component *node);
-
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
-  virtual int visit_connector (be_connector *node);
-};
-
-#endif /* BE_STRATEGIZED_PROXY_BROKER_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h
deleted file mode 100644
index 8962eed07f8..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//=============================================================================
-/**
- *  @file    strategized_proxy_broker_ss.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor generates the declaration for the strategized
- *   ProxyBroker class.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef BE_STRATEGIZED_PROXY_BROKER_SS_H_
-#define BE_STRATEGIZED_PROXY_BROKER_SS_H_
-
-/**
- * @class be_visitor_interface_direct_proxy_impl_ss
- *
- * @brief Generates the implementation for the base proxy
- * broker class.
- */
-class be_visitor_interface_strategized_proxy_broker_ss
-  : public be_visitor_interface
-{
-public:
-  // -- Ctor/Dtor Decl. --
-  be_visitor_interface_strategized_proxy_broker_ss (be_visitor_context *ctx);
-
-  virtual ~be_visitor_interface_strategized_proxy_broker_ss (void);
-
-  /// visit an interface
-  virtual int visit_interface (be_interface *node);
-
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
-  virtual int visit_component (be_component *node);
-
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
-  virtual int visit_connector (be_connector *node);
-
-private:
-  void gen_direct_operations (be_interface *node, TAO_OutStream *os);
-};
-
-#endif /* BE_STRATEGIZED_PROXY_BROKER_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h
deleted file mode 100644
index 6634ce65a66..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//=============================================================================
-/**
- *  @file    base_proxy_impl_ch.h
- *
- *  $Id$
- *
- *  Visitor for generating code for proxy implementations.
- *
- *
- *  @author Angelo Corsaro
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_OPERATION_BASE_PROXY_IMPL_CH_H_
-#define _BE_VISITOR_OPERATION_BASE_PROXY_IMPL_CH_H_
-
-
-/**
- * @class be_visitor_operation_base_proxy_impl_ch
- *
- * @brief be_visitor_operation_base_proxy_impl_ch
- *
- * Concrete visitor that generates the code for the base class
- * of Proxy Impls.
- */
-class be_visitor_operation_base_proxy_impl_ch : public be_visitor_scope
-{
-public:
-  /// constructor
-  be_visitor_operation_base_proxy_impl_ch (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_operation_base_proxy_impl_ch (void);
-
-  /// visit operation.
-  virtual int visit_operation (be_operation *node);
-};
-
-#endif /* _BE_VISITOR_OPERATION_BASE_PROXY_IMPL_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h
deleted file mode 100644
index cbc22ba84d7..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//=============================================================================
-/**
- *  @file    remote_proxy_impl_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for remote proxy impls
- *  in client stubs.
- *
- *
- *
- *  @author Aniruddha Gokhale & Angelo Corsaro
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_OPERATION_REMOTE_PROXY_IMPL_OPERATION_REMOTE_PROXY_IMPL_CS_H_
-#define _BE_VISITOR_OPERATION_REMOTE_PROXY_IMPL_OPERATION_REMOTE_PROXY_IMPL_CS_H_
-
-// ************************************************************
-// Operation_Remote_Proxy_Impl visitor for client stubs
-// ************************************************************
-
-/**
- * @class be_visitor_operation_remote_proxy_impl_cs
- *
- * @brief be_visitor_operation_remote_proxy_impl_cs
- *
- * This is a concrete visitor to generate the client invocation
- * code for the Remote Proxy Implementation.
- */
-class be_visitor_operation_remote_proxy_impl_cs : public be_visitor_operation
-{
-public:
-  /// constructor
-  be_visitor_operation_remote_proxy_impl_cs (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_operation_remote_proxy_impl_cs (void);
-
-  /// visit operation_remote_proxy_impl.
-  virtual int visit_operation (be_operation *node);
-
-  /// visit argument to generate ParamData entries
-  virtual int visit_argument (be_argument *node);
-
-  // = template methods
-
-  // =helper
-  /// stuff to output after every member of the scope is handled
-  virtual int post_process (be_decl *);
-};
-
-#endif /* _BE_VISITOR_OPERATION_REMOTE_PROXY_IMPL_OPERATION_REMOTE_PROXY_IMPL_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
index 8bf913f21db..14ac16e5a56 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
@@ -44,7 +44,6 @@ private:
   /// the main scope traversal.
   int gen_arg_traits (be_root *node);
   void gen_fwd_decls (void);
-  void gen_proxy_broker_factory_pointers (void);
   void gen_ref_counting_overrides (void);
   void gen_static_corba_overrides (void);
   int gen_obv_decls (be_root *node);