ChangeLogTag: Tue Jul 3 11:27:03 2001 Jeff Parsons <parsons@cs.wustl.edu>

3 files changed, 20 insertions, 8 deletions

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 7dbeeccd12c..5d2607f8e0b 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -590,8 +590,6 @@ TAO_CodeGen::start_server_template_header (const char *fname)
 
       *this->server_template_header_ << "#endif /* _MSC_VER */\n\n";
 
-      *this->server_template_header_ << "#if defined (ACE_HAS_USING_KEYWORD)\n\n";
-
       return 0;
     }
 }
@@ -818,8 +816,6 @@ TAO_CodeGen::start_server_template_inline (const char *fname)
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_template_inline_);
 
-  *this->server_template_inline_ << "#if defined (ACE_HAS_USING_KEYWORD)\n\n";
-
   return 0;
 }
 
@@ -1069,8 +1065,6 @@ TAO_CodeGen::end_implementation_header (const char *fname)
 int
 TAO_CodeGen::end_server_template_header (void)
 {
-  *this->server_template_header_ << "#endif /* ACE_HAS_USING_KEYWORD */\n";
-
   // Insert the code to include the inline file.
   *this->server_template_header_ << "\n#if defined (__ACE_INLINE__)\n";
   *this->server_template_header_
@@ -1118,8 +1112,6 @@ TAO_CodeGen::end_server_template_header (void)
 int
 TAO_CodeGen::end_server_template_inline (void)
 {
-  *this->server_template_inline_ << "#endif /* ACE_HAS_USING_KEYWORD */\n";
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index e12ca741dbe..0facc924913 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -85,6 +85,11 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
                        node->local_name ());
     }
 
+  if (node->is_nested ())
+    {
+      *os << "#if defined (ACE_HAS_USING_KEYWORD)\n\n";
+    }
+
   // Now generate the class definition.
   os->indent ();
 
@@ -145,6 +150,11 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "void operator= (const " << tiename << " &);" << be_uidt_nl
       << "};\n\n";
 
+  if (node->is_nested ())
+    {
+      *os << "#endif /* ACE_HAS_USING_KEYWORD */\n\n";
+    }
+
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
index 05439f43efb..4628d2db252 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -78,6 +78,11 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
                        node->local_name ());
     }
 
+  if (node->is_nested ())
+    {
+      *os << "#if defined (ACE_HAS_USING_KEYWORD)\n\n";
+    }
+
   os->indent (); // start with whatever indentation level we are at
 
   *os << "template <class T> ACE_INLINE" << be_nl
@@ -174,6 +179,11 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
                         -1);
     }
 
+  if (node->is_nested ())
+    {
+      *os << "#endif /* ACE_HAS_USING_KEYWORD */\n\n";
+    }
+
   return 0;
 }