ChangeLogTag:Thu May 7 15:29:46 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

2 files changed, 27 insertions, 16 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index d327a1e7306..23b1788e1e9 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,13 @@
+Thu May  7 15:29:46 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* TAO_IDL/be/be_codegen.cpp: 
+	  The warning was disabled before including other headers, it is
+	  possible (and in some cases certain) that the headers will
+	  enable the warning again. We now disable *after* all the
+	  includes and re-enable at the end.  Thanks to Darrell Brunsch
+	  <brunsch@cs.wustl.edu> for catching this one before we even
+	  tried it :-)
+
 Thu May  7 15:17:30 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* Makefile: 
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index cfa2f74d194..7cad882fd3e 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -227,10 +227,6 @@ TAO_CodeGen::client_header (const char *fname)
           this->client_header_->print ("#if !defined (%s)\n", macro_name);
           this->client_header_->print ("#define %s\n\n", macro_name);
 
-	  *this->client_header_ << "#if defined(_MSC_VER)\n"
-				<< "#pragma warning(disable:4250)\n"
-				<< "#endif /* _MSC_VER */\n\n";
-
           *this->client_header_ << "#include \"tao/corba.h\"\n";
 
 	  if (idl_global->export_include () != 0)
@@ -265,6 +261,11 @@ TAO_CodeGen::client_header (const char *fname)
 		}
 	    }
 	  *this->client_header_ << "\n";
+
+	  *this->client_header_ << "#if defined(_MSC_VER)\n"
+				<< "#pragma warning(disable:4250)\n"
+				<< "#endif /* _MSC_VER */\n\n";
+
           return 0;
         }
     }
@@ -382,10 +383,6 @@ TAO_CodeGen::server_header (const char *fname)
           this->server_header_->print ("#if !defined (%s)\n", macro_name);
           this->server_header_->print ("#define %s\n\n", macro_name);
 
-	  *this->server_header_ << "#if defined(_MSC_VER)\n"
-				<< "#pragma warning(disable:4250)\n"
-				<< "#endif /* _MSC_VER */\n\n";
-
 	  // We must include all the skeleton headers corresponding to
 	  // IDL files included by the current IDL file.
 	  for (size_t j = 0;
@@ -405,6 +402,10 @@ TAO_CodeGen::server_header (const char *fname)
           *this->server_header_ << "#include \"" <<
             idl_global->be_get_client_hdr_fname () << "\"\n\n";
 
+	  *this->server_header_ << "#if defined(_MSC_VER)\n"
+				<< "#pragma warning(disable:4250)\n"
+				<< "#endif /* _MSC_VER */\n\n";
+
           return 0;
         }
     }
@@ -484,16 +485,16 @@ TAO_CodeGen::server_inline (void)
 int
 TAO_CodeGen::end_client_header (void)
 {
-  *this->client_header_ << "#if defined(_MSC_VER)\n"
-			<< "#pragma warning(default:4250)\n"
-			<< "#endif /* _MSC_VER */\n";
-
   // insert the code to include the inline file
   *this->client_header_ << "\n#if defined (__ACE_INLINE__)\n";
   *this->client_header_ << "#include \"" <<
     idl_global->be_get_client_inline_fname () << "\"\n";
   *this->client_header_ << "#endif /* defined INLINE */\n\n";
 
+  *this->client_header_ << "#if defined(_MSC_VER)\n"
+			<< "#pragma warning(default:4250)\n"
+			<< "#endif /* _MSC_VER */\n";
+
   // code to put the last #endif
   *this->client_header_ << "\n#endif /* if !defined */\n";
   return 0;
@@ -502,16 +503,16 @@ TAO_CodeGen::end_client_header (void)
 int
 TAO_CodeGen::end_server_header (void)
 {
-  *this->server_header_ << "#if defined(_MSC_VER)\n"
-			<< "#pragma warning(default:4250)\n"
-			<< "#endif /* _MSC_VER */\n";
-
   // insert the code to include the inline file
   *this->server_header_ << "\n#if defined (__ACE_INLINE__)\n";
   *this->server_header_ << "#include \"" <<
     idl_global->be_get_server_inline_fname () << "\"\n";
   *this->server_header_ << "#endif /* defined INLINE */\n\n";
 
+  *this->server_header_ << "#if defined(_MSC_VER)\n"
+			<< "#pragma warning(default:4250)\n"
+			<< "#endif /* _MSC_VER */\n";
+
   // code to put the last #endif
   *this->server_header_ << "\n#endif /* if !defined */\n";
   return 0;