Mon Jul 18 06:37:53 UTC 2011 Martin Corino <mcorino@remedy.nl>

2 files changed, 39 insertions, 32 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 00dc8289df3..2beef12eccc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 18 06:37:53 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Changed server header start and end generation in case of
+          skeleton file suppression (-SS) to fix versioning bracketing
+          problems as a result of changed arg traits generation.
+
 Fri Jul 15 12:46:14 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_root/root_sh.cpp:
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index dc320662866..b37de96f1ee 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -515,44 +515,44 @@ TAO_CodeGen::start_server_header (const char *fname)
                                    server_hdr);
     }
 
-  /// These are generated regardless, so we put it before the 
+  /// These are generated regardless, so we put it before the
   /// check below.
   if (be_global->gen_arg_traits ())
     {
       this->gen_skel_arg_file_includes (this->server_header_);
     }
 
-  // If we are suppressing skel file generation, bail after generating the
-  // copyright text and an informative message.
-  if (!be_global->gen_skel_files ())
+  if (be_global->gen_skel_files ())
     {
-      *this->server_header_ << be_nl_2
-                            << "// Skeleton file generation suppressed with "
-                            << "command line option -SS";
-
-      return 0;
-    }
-
-  // Some compilers don't optimize the #ifndef header include
-  // protection, but do optimize based on #pragma once.
-  *this->server_header_ << "\n\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
-                        << "# pragma once\n"
-                        << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n";
+      // Some compilers don't optimize the #ifndef header include
+      // protection, but do optimize based on #pragma once.
+      *this->server_header_ << "\n\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
+                            << "# pragma once\n"
+                            << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n";
 
-  this->gen_skel_hdr_includes ();
+      this->gen_skel_hdr_includes ();
 
-  if (be_global->skel_export_include () != 0)
+      if (be_global->skel_export_include () != 0)
+        {
+          *this->server_header_ << "\n\n#include /**/ \""
+                                << be_global->skel_export_include ()
+                                << "\"";
+
+          // Generate the TAO_EXPORT_MACRO macro.
+          *this->server_header_ << "\n\n#if defined (TAO_EXPORT_MACRO)\n";
+          *this->server_header_ << "#undef TAO_EXPORT_MACRO\n";
+          *this->server_header_ << "#endif\n";
+          *this->server_header_ << "#define TAO_EXPORT_MACRO "
+                                << be_global->skel_export_macro ();
+        }
+    }
+  else
     {
-      *this->server_header_ << "\n\n#include /**/ \""
-                            << be_global->skel_export_include ()
-                            << "\"";
-
-      // Generate the TAO_EXPORT_MACRO macro.
-      *this->server_header_ << "\n\n#if defined (TAO_EXPORT_MACRO)\n";
-      *this->server_header_ << "#undef TAO_EXPORT_MACRO\n";
-      *this->server_header_ << "#endif\n";
-      *this->server_header_ << "#define TAO_EXPORT_MACRO "
-                            << be_global->skel_export_macro ();
+      // If we are suppressing skel file generation, bail after generating the
+      // copyright text and an informative message.
+      *this->server_header_ << be_nl_2
+                            << "// Skeleton file generation suppressed with "
+                            << "command line option -SS";
     }
 
   // Begin versioned namespace support after initial headers have been
@@ -1639,14 +1639,14 @@ TAO_CodeGen::end_server_header (void)
 {
   TAO_OutStream *os = this->server_header_;
 
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *os << be_global->versioning_end ();
+
   /// Otherwise just generate the post_include(), if any,
   /// and the #endif.
   if (be_global->gen_skel_files ())
     {
-      // End versioned namespace support.  Do not place include directives
-      // before this.
-      *os << be_global->versioning_end ();
-
       // Insert the template header.
       if (be_global->gen_tie_classes ())
         {