diff options
author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-22 01:25:05 +0000 |
---|---|---|
committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-22 01:25:05 +0000 |
commit | 57293b7d2b72cbe8a4f1bf088cd0790a60975b5d (patch) | |
tree | 54038bfacd793244ca1dbf9de8de1b5f6a34d891 /TAO/tao/CurrentC.h | |
parent | d71c429d9a57f652d12e1d0a3f5e2d0c42a017a3 (diff) | |
download | ATCD-57293b7d2b72cbe8a4f1bf088cd0790a60975b5d.tar.gz |
ChangeLogTag:Sun Nov 21 19:15:10 1999 Darrell Brunsch <brunsch@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/CurrentC.h')
-rw-r--r-- | TAO/tao/CurrentC.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index 24c22b9a46d..3e14ab636bd 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -37,7 +37,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined(_MSC_VER) +#if (_MSC_VER >= 1200) #pragma warning(push) +#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -152,7 +154,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Current *&); #include "tao/CurrentC.i" #endif /* defined INLINE */ -#if defined(_MSC_VER) +#if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ |