diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 66f85f5542a..28cf7fbd97c 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -31,8 +31,11 @@ // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. -#if defined (_MSC_VER) -# pragma warning (disable : 4250) +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) #endif /* _MSC_VER */ // = Classes to deal with the ACE_Hash_Map_Manager. @@ -606,9 +609,8 @@ private: // The iterator object. }; - -#if defined(_MSC_VER) -#pragma warning(default:4250) +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) #endif /* _MSC_VER */ #include "ace/post.h" |