diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-09-23 19:47:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-09-23 19:47:26 +0000 |
| commit | 0dba3148504c5a975523f0056e1a566ac8bd76f0 (patch) | |
| tree | dda04c56b416f7d4d1a71508bd19314726ff86ea | |
| parent | 06fbeddce693ff9655a31299f02d03f35d4efc0a (diff) | |
| download | ATCD-0dba3148504c5a975523f0056e1a566ac8bd76f0.tar.gz | |
ChangeLogTag: Thu Sep 23 19:47:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index d1a72b65667..4c62bb89837 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -252,9 +252,7 @@ TAO_CodeGen::start_client_header (const char *fname) << "#endif /* TAO_EXPORT_NESTED_CLASSES */"; *this->client_header_ << "\n\n#if defined(_MSC_VER)\n" - << "#if (_MSC_VER >= 1200)\n" << "#pragma warning(push)\n" - << "#endif /* _MSC_VER >= 1200 */\n" << "#pragma warning(disable:4250)"; if (be_global->use_raw_throw ()) @@ -467,9 +465,7 @@ TAO_CodeGen::start_server_header (const char *fname) *this->server_header_ << be_nl << be_nl << "#if defined(_MSC_VER)\n" - << "#if (_MSC_VER >= 1200)\n" << "#pragma warning(push)\n" - << "#endif /* _MSC_VER >= 1200 */\n" << "#pragma warning(disable:4250)"; if (be_global->use_raw_throw ()) @@ -563,9 +559,7 @@ TAO_CodeGen::start_server_template_header (const char *fname) } *this->server_template_header_ << "\n\n#if defined(_MSC_VER)\n" - << "#if (_MSC_VER >= 1200)\n" << "#pragma warning(push)\n" - << "#endif /* _MSC_VER >= 1200 */\n" << "#pragma warning(disable:4250)\n"; if (be_global->use_raw_throw ()) @@ -970,7 +964,7 @@ TAO_CodeGen::end_client_header (void) << "\"\n"; *this->client_header_ << "#endif /* defined INLINE */"; - *this->client_header_ << "\n\n#if defined(_MSC_VER) && (_MSC_VER >= 1200)\n" + *this->client_header_ << "\n\n#if defined(_MSC_VER)\n" << "#pragma warning(pop)\n" << "#endif /* _MSC_VER */"; @@ -1015,7 +1009,7 @@ TAO_CodeGen::end_server_header (void) << "\"\n"; *this->server_header_ << "#endif /* defined INLINE */"; - *this->server_header_ << "\n\n#if defined(_MSC_VER) && (_MSC_VER >= 1200)\n" + *this->server_header_ << "\n\n#if defined(_MSC_VER)\n" << "#pragma warning(pop)\n" << "#endif /* _MSC_VER */"; @@ -1122,7 +1116,7 @@ TAO_CodeGen::end_server_template_header (void) << "\")"; *this->server_template_header_ << "\n#endif /* defined REQUIRED PRAGMA */"; - *this->server_template_header_ << "\n\n#if defined(_MSC_VER) && (_MSC_VER >= 1200)\n" + *this->server_template_header_ << "\n\n#if defined(_MSC_VER)\n" << "#pragma warning(pop)\n" << "#endif /* _MSC_VER */"; |