Thu Jan 28 07:54:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        Merged revision 88742-88757 from idl3_plus_backend2 to svn head. This
        gives us templated modules for the small parts we need for dds4ccm

        Wed Jan 27 22:19:17 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>

        * TAO_IDL/be/be_decl.cpp:
        * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
        * TAO_IDL/be_include/be_decl.h:

          Added check to ensure that a facet interface gets generated
          only once in the executor header and source files. This fix
          closes [BUGID:3817]. Thanks to Abdul Sowayan <sowayan@gmail.com>
          for reporting the bug.

        * TAO_IDL/fe/y.tab.cpp:
        * TAO_IDL/fe/idl.yy:

          Cosmetic changes.

        Wed Jan 27 20:08:48 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>

        * TAO_IDL/include/ast_union.h:
        * TAO_IDL/include/ast_visitor_tmpl_module_inst.h:
        * TAO_IDL/include/utl_labellist.h:
        * TAO_IDL/include/ast_union_branch.h:
        * TAO_IDL/include/utl_scope.h:
        * TAO_IDL/be/be_union_label.cpp:
        * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp:
        * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp:
        * TAO_IDL/ast/ast_visitor_reifying.cpp:
        * TAO_IDL/ast/ast_enum.cpp:
        * TAO_IDL/ast/ast_union_branch.cpp:
        * TAO_IDL/util/utl_labellist.cpp:
        * TAO_IDL/util/utl_exceptlist.cpp:
        * TAO_IDL/util/utl_idlist.cpp:
        * TAO_IDL/util/utl_scope.cpp:

          Added support for unions and enums in the scope of a
          template module.

1 files changed, 33 insertions, 6 deletions

diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 0d835ab4587..df0ce31d2c7 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -48,10 +48,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/String_Base.h"
 
-ACE_RCSID (be,
-           be_decl,
-           "$Id$")
-
 // Default Constructor
 be_decl::be_decl (void)
   : COMMON_Base (),
@@ -101,7 +97,9 @@ be_decl::be_decl (void)
     ccm_pre_proc_gen_ (false),
     ex_idl_facet_gen_ (false),
     svnt_hdr_facet_gen_ (false),
-    svnt_src_facet_gen_ (false)
+    svnt_src_facet_gen_ (false),
+    exec_hdr_facet_gen_ (false),
+    exec_src_facet_gen_ (false)
 {
 }
 
@@ -153,7 +151,12 @@ be_decl::be_decl (AST_Decl::NodeType type,
     srv_outarg_pragma_inst_gen_ (false),
     srv_retarg_tmpl_class_gen_ (false),
     srv_retarg_pragma_inst_gen_ (false),
-    ccm_pre_proc_gen_ (false)
+    ccm_pre_proc_gen_ (false),
+    ex_idl_facet_gen_ (false),
+    svnt_hdr_facet_gen_ (false),
+    svnt_src_facet_gen_ (false),
+    exec_hdr_facet_gen_ (false),
+    exec_src_facet_gen_ (false)
 {
 }
 
@@ -633,6 +636,18 @@ be_decl::svnt_src_facet_gen (void)
   return this->svnt_src_facet_gen_;
 }
 
+bool
+be_decl::exec_hdr_facet_gen (void)
+{
+  return this->exec_hdr_facet_gen_;
+}
+
+bool
+be_decl::exec_src_facet_gen (void)
+{
+  return this->exec_src_facet_gen_;
+}
+
 // Set the flag indicating that code generation is done.
 void
 be_decl::cli_hdr_gen (bool val)
@@ -905,6 +920,18 @@ be_decl::svnt_src_facet_gen (bool val)
   this->svnt_src_facet_gen_ = val;
 }
 
+void
+be_decl::exec_hdr_facet_gen (bool val)
+{
+  this->exec_hdr_facet_gen_ = val;
+}
+
+void
+be_decl::exec_src_facet_gen (bool val)
+{
+  this->exec_src_facet_gen_ = val;
+}
+
 //==========================================
 
 int