diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-10 14:47:41 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-10 14:47:41 +0000 |
commit | 3eba717916765a624a87cda846ee002f8dd4e46c (patch) | |
tree | 61458a9358a7e3c990311d298968ff6878a72f4c /TAO/tests/Crashed_Callback | |
parent | 29ac699f115fbfe2d6b2dec0f77a951dc4a347f6 (diff) | |
download | ATCD-3eba717916765a624a87cda846ee002f8dd4e46c.tar.gz |
ChangeLogTag: Thu Mar 10 14:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/Crashed_Callback')
-rw-r--r-- | TAO/tests/Crashed_Callback/Crashed_Callback.h | 6 | ||||
-rw-r--r-- | TAO/tests/Crashed_Callback/Service.h | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h index 2c296932071..c99b6d8d04f 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.h +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h @@ -9,9 +9,7 @@ #include "TestS.h" #if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ +# pragma warning(push) # pragma warning (disable:4250) #endif /* _MSC_VER */ @@ -35,7 +33,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h index 1a7daec789d..cf8d3f72fb5 100644 --- a/TAO/tests/Crashed_Callback/Service.h +++ b/TAO/tests/Crashed_Callback/Service.h @@ -9,9 +9,7 @@ #include "TestS.h" #if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ +# pragma warning(push) # pragma warning (disable:4250) #endif /* _MSC_VER */ @@ -57,7 +55,7 @@ private: int test_count_; }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ |