summaryrefslogtreecommitdiff
path: root/TAO/tests/Muxing
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-03-10 14:47:41 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-03-10 14:47:41 +0000
commit3eba717916765a624a87cda846ee002f8dd4e46c (patch)
tree61458a9358a7e3c990311d298968ff6878a72f4c /TAO/tests/Muxing
parent29ac699f115fbfe2d6b2dec0f77a951dc4a347f6 (diff)
downloadATCD-3eba717916765a624a87cda846ee002f8dd4e46c.tar.gz
ChangeLogTag: Thu Mar 10 14:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/Muxing')
-rw-r--r--TAO/tests/Muxing/Receiver.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index af0f98e35b3..247d7222d6f 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.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 */
@@ -43,7 +41,7 @@ private:
CORBA::ULong byte_count_;
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif /* _MSC_VER */