diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-23 17:00:00 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-23 17:00:00 +0000 |
| commit | d406a3540dedce19c58afc033e59348e72d88957 (patch) | |
| tree | 8de6116f35ab63cabe7b93310e4e1afcf26bbc31 /TAO/TAO_IDL/include/ast.h | |
| parent | 71926d1c774961f5a74db11afbdbab45379aaf5c (diff) | |
| download | ATCD-d406a3540dedce19c58afc033e59348e72d88957.tar.gz | |
ChangeLogTag: Wed Aug 23 11:53:43 2000 Jeff Parsons <parsons@cs.wustl.edu>
Diffstat (limited to 'TAO/TAO_IDL/include/ast.h')
| -rw-r--r-- | TAO/TAO_IDL/include/ast.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h index 0f95cb271d0..dd8116e5816 100644 --- a/TAO/TAO_IDL/include/ast.h +++ b/TAO/TAO_IDL/include/ast.h @@ -78,6 +78,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from idl.hh */ +// This is to remove "inherits via dominance" warnings from MSVC. +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +# pragma warning (disable : 4250) +#endif /* _MSC_VER */ + #include "utl_scoped_name.h" // Define UTL_ScopedName #include "ast_decl.h" // class AST_Decl @@ -88,7 +96,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_type.h" // class AST_Type #include "ast_concrete_type.h" // class AST_ConcreteType -#include "ast_predefined_type.h"// class AST_PredefinedType +#include "ast_predefined_type.h" // class AST_PredefinedType #include "ast_module.h" // class AST_Module #include "ast_root.h" // class AST_Root #include "ast_interface.h" // class AST_Interface @@ -108,13 +116,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_array.h" // class AST_Array #include "ast_sequence.h" // class AST_Sequence #include "ast_string.h" // class AST_String -#include "ast_typedef.h" // class AST_Typedef +#include "ast_typedef.h" // class AST_Typedef #include "ast_native.h" // class AST_Native #include "utl_list.h" // class UTL_List -#include "utl_strlist.h" // class UTL_StrList +#include "utl_strlist.h" // class UTL_StrList #include "utl_exprlist.h" // class UTL_ExprList #include "ast_generator.h" // class AST_Generator +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #endif // _AST_AST_HH |