diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-03-06 14:09:38 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-03-06 14:09:38 +0000 |
| commit | 7d024a3b3684aa89ad63cda99987b7c0117f26bf (patch) | |
| tree | f0e7be9ef3efd66cb9d7c9ca81b38a7d0b78262d | |
| parent | 451110fd71b2ef81b501c3b82f50079ec513f341 (diff) | |
| download | ATCD-7d024a3b3684aa89ad63cda99987b7c0117f26bf.tar.gz | |
ChangeLogTag:Tue Mar 06 14:30:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index f21dc305792..d36cc8bcb96 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed Mar 6 07:29:19 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * orbsvcs/orbsvcs/Property/CosPropertyService_i.h: Correctly push/pop + the pragma that disables the annoying MSVC 4250 warning. Thanks + to Bruce McIntosh <Bruce.McIntosh@Australia.Boeing.com> for + reporting this. + Tue Mar 5 23:47:17 2002 Ossama Othman <ossama@uci.edu> * tao/Object.h: 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" |