Sat Jan 16 18:48:19 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

          Merged revision 88565-88579 from idl3_plus_backend2 to svn head

        Fri Jan 15 20:31:51 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>

        * TAO_IDL/include/idl_global.h:
        * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp:
        * TAO_IDL/be/be_visitor_context.cpp:
        * TAO_IDL/be/be_visitor_reifying.cpp:
        * TAO_IDL/be_include/be_visitor_context.h:
        * TAO_IDL/be_include/be_visitor_reifying.h:
        * TAO_IDL/util/utl_global.cpp:
        * TAO_IDL/util/utl_scope.cpp:

          - Removed the template module instantation
            scope storage in the visitor context, using
            instead the global scope stack for that
            purpose.

          - Modified reifying visitor to find and store
            a node already created in a template module
            instantiation, if the corresponding node is
            referenced in the template module.

        Fri Jan 15 15:31:56 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>

        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:

          Reverted a small change made yesterday where the
          generation of a double colon was prefixed to a name
          that is not global.

2 files changed, 3 insertions, 9 deletions

diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h
index b76d4def3bd..476f273aa5b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_context.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_context.h
@@ -158,9 +158,6 @@ public:
   FE_Utils::T_ARGLIST *template_args (void) const;
   void template_args (FE_Utils::T_ARGLIST *args);
   
-  be_scope *template_module_inst_scope (void) const;
-  void template_module_inst_scope (UTL_Scope *s);
-  
   // = helpers
 
   // visitors may need the actual type of the node stored in this context. We
@@ -300,10 +297,6 @@ private:
   // Storage for the current template module params and args.
   FE_Utils::T_PARAMLIST_INFO *template_params_;
   FE_Utils::T_ARGLIST *template_args_;
-  
-  // Scope for adding the instantiated contents of a template
-  // module.
-  be_scope *template_module_inst_scope_;
 };
 
 #if defined (interface)
diff --git a/TAO/TAO_IDL/be_include/be_visitor_reifying.h b/TAO/TAO_IDL/be_include/be_visitor_reifying.h
index b046a123976..b6baf89dc80 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_reifying.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_reifying.h
@@ -27,8 +27,9 @@
 
 #include "be_visitor_decl.h"
 
-class AST_Decl;
+#include "utl_scoped_name.h"
 
+class AST_Decl;
 class be_param_holder;
 
 class be_visitor_reifying : public be_visitor_decl
@@ -67,7 +68,7 @@ public:
   virtual int visit_param_holder (be_param_holder *node);
 
 private:
-  bool declared_in_template_module (AST_Decl *d);
+  UTL_ScopedName *template_module_rel_name (AST_Decl *d);
 
 private:
   AST_Decl *reified_node_;