ChangeLogTag: Wed Mar 9 20:14:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 18 insertions, 36 deletions

diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h
index 1505b66f5ae..3851a2748d6 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.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 */
 
@@ -47,7 +45,7 @@ private:
   Test::AMI_Buffering_Admin_var admin_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
index 07af98612a4..e8a3cdb00db 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.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 */
 
@@ -52,7 +50,7 @@ private:
   CORBA::ULong bytes_received_count_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index ccd2c894800..be2afed0986 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.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 */
 
@@ -44,7 +42,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/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index ea46d3b5f99..85869dfeeee 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.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 */
 
@@ -59,7 +57,7 @@ private:
   size_t peer_max_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index e8a166f2d86..423c57414b2 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.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::ORB_var orb_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index e52ef805e36..ff9da265097 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -17,9 +17,7 @@
 #endif  /* ACE_HAS_THREADS */
 
 #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 */
 
@@ -115,7 +113,7 @@ private:
   Barrier barrier_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index a0b664f92f1..321e2c84ae5 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.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 */
 
@@ -49,7 +47,7 @@ private:
   CORBA::Boolean success_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h
index 641da210886..b374bea1360 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.h
+++ b/TAO/tests/Big_Reply/Big_Reply_i.h
@@ -16,9 +16,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 */
 
@@ -61,7 +59,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index 12f3555a252..cc32a3c1f92 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_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 */
 
@@ -42,7 +40,7 @@ private:
   CORBA::ULong byte_count_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */