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/LongUpcalls | |
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/LongUpcalls')
-rw-r--r-- | TAO/tests/LongUpcalls/AMI_Manager.h | 6 | ||||
-rw-r--r-- | TAO/tests/LongUpcalls/Controller.h | 6 | ||||
-rw-r--r-- | TAO/tests/LongUpcalls/Manager.h | 6 | ||||
-rw-r--r-- | TAO/tests/LongUpcalls/Manager_Handler.h | 6 |
4 files changed, 8 insertions, 16 deletions
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index a351e61d38d..7166507b05c 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -7,9 +7,7 @@ #include "ace/Task.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 */ @@ -89,7 +87,7 @@ private: // The mutex is used to protect the access to the flag. }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h index 47587760e7f..b1a86c977eb 100644 --- a/TAO/tests/LongUpcalls/Controller.h +++ b/TAO/tests/LongUpcalls/Controller.h @@ -6,9 +6,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 @@ private: CORBA::ULong finish_count_; }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index 9a73fac67ba..2a075460e3d 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -9,9 +9,7 @@ #include "ace/Task.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: // The number of milliseconds. }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h index 7ead1579196..2ad954a1a56 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.h +++ b/TAO/tests/LongUpcalls/Manager_Handler.h @@ -9,9 +9,7 @@ #include "ace/Task.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 */ @@ -40,7 +38,7 @@ private: // The controller }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ |