Tue Jan 19 08:44:19 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_codegen.cpp:
          Simplification

        * TAO_IDL/be/be_interface.cpp:
          Generate implied AMI4CCM node

        * TAO_IDL/be/be_produce.cpp:
          Do CCM preprocessing after AMI4CCM

4 files changed, 35 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f93b34d9b6b..793f8648cdb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Jan 19 08:44:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Simplification
+
+        * TAO_IDL/be/be_interface.cpp:
+          Generate implied AMI4CCM node
+
+        * TAO_IDL/be/be_produce.cpp:
+          Do CCM preprocessing after AMI4CCM
+
 Tue Jan 19 07:25:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/IDL_Test/IDL_Test.mpc:
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 070f1c107a5..6b39fdfa7a7 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -2256,7 +2256,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
                                this->client_header_);
 
   // Include the Messaging library entry point, if AMI is enabled.
-  if (be_global->ami_call_back () == true)
+  if (be_global->ami_call_back ())
     {
       // Include Messaging skeleton file.
       this->gen_standard_include (this->client_header_,
@@ -2264,7 +2264,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
     }
 
   // Include the AMI4CCM library entry point, if AMI4CCM is enabled.
-  if (be_global->ami4ccm_call_back () == true)
+  if (be_global->ami4ccm_call_back ())
     {
       // Include Messaging skeleton file.
       this->gen_standard_include (this->client_header_,
@@ -2272,7 +2272,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
     }
 
   // Include the smart proxy base class if smart proxies are enabled.
-  if (be_global->gen_smart_proxies () == true)
+  if (be_global->gen_smart_proxies ())
     {
       this->gen_standard_include (this->client_header_,
                                   "tao/SmartProxies/Smart_Proxies.h");
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index c2f689f5208..beadfd3cf9a 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -2670,6 +2670,20 @@ be_interface::gen_facet_idl (TAO_OutStream &os)
   os << be_uidt_nl
      << "};";
 
+  if (be_global->ami4ccm_call_back ())
+    {
+      os << be_nl << be_nl
+         << "local interface CCM_AMI_"
+         << this->original_local_name ()->get_string ()
+         << " : ::"
+         << IdentifierHelper::orig_sn (this->name ()).c_str ()
+         << be_nl
+         << "{" << be_idt;
+
+      os << be_uidt_nl
+         << "};";
+    }
+
   this->gen_nesting_close (os);
 
   this->ex_idl_facet_gen (true);
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 42a8c34b9b6..fb698726caa 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -120,13 +120,10 @@ BE_produce (void)
 
   if (!idl_global->ignore_idl3 ())
     {
-      // This visitor needs to make its pass before the CCM
+      // This visitor needs to make its pass before any other
       // processing visitor.
       be_visitor_tmpl_module_inst tmpl_mod_inst_visitor (&ctx);
       BE_visit_root (tmpl_mod_inst_visitor, "template module procdessing");
-      
-      be_visitor_ccm_pre_proc ccm_preproc_visitor (&ctx);
-      BE_visit_root (ccm_preproc_visitor, "CCM preprocessing");
     }
 
   if (be_global->ami4ccm_call_back ())
@@ -135,6 +132,12 @@ BE_produce (void)
       BE_visit_root (ami4ccmpreproc_visitor, "AMI4CCM preprocessing");
     }
 
+  if (!idl_global->ignore_idl3 ())
+    {
+      be_visitor_ccm_pre_proc ccm_preproc_visitor (&ctx);
+      BE_visit_root (ccm_preproc_visitor, "CCM preprocessing");
+    }
+
   if (be_global->ami_call_back ())
     {
       be_visitor_ami_pre_proc ami_preproc_visitor (&ctx);