ChangeLogTag: Thu Mar 10 14:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

91 files changed, 133 insertions, 315 deletions

diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index 091037d4ba7..0ab7114df8d 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/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 */
 
@@ -58,7 +56,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_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h
index e8a166f2d86..423c57414b2 100644
--- a/TAO/tests/Big_Twoways/Peer.h
+++ b/TAO/tests/Big_Twoways/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_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 58cc353e8d9..64c46b65143 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/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 */
 
@@ -113,7 +111,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_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index a0b664f92f1..321e2c84ae5 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/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/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index 204dd4c67fc..399c43a9bce 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.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 */
 
@@ -38,7 +36,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/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h
index ecbc5383ce1..f698fe5e4eb 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.h
+++ b/TAO/tests/Bug_1476_Regression/Sender_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 */
 
@@ -62,7 +60,7 @@ private:
   CORBA::ULong number_received_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h
index 71748e7446e..b4c057f18aa 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.h
+++ b/TAO/tests/Bug_1482_Regression/Hello.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 */
 
@@ -40,7 +38,7 @@ private:
   CORBA::ULong latest_prime_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
index ade5e43c844..8ea41d53689 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
@@ -18,9 +18,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +40,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/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
index d3b9f26fece..d5aef56e289 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
@@ -19,9 +19,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -52,7 +50,7 @@ private:
   Echo_Server_Request_Interceptor * server_interceptor_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Bug_1495_Regression/interceptors.h b/TAO/tests/Bug_1495_Regression/interceptors.h
index 1c0cedc3811..af06178218d 100644
--- a/TAO/tests/Bug_1495_Regression/interceptors.h
+++ b/TAO/tests/Bug_1495_Regression/interceptors.h
@@ -14,9 +14,7 @@
 #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 */
 
@@ -129,7 +127,7 @@ private:
   bool forward_location_done_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h
index 24e85843c8d..5a201a415a1 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.h
+++ b/TAO/tests/Bug_1551_Regression/Hello.h
@@ -10,9 +10,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:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX,long> atomic_counter_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index 9097ddddbb4..ac59ba89dc2 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.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 */
 
@@ -37,7 +35,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/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index d9780b26aa7..f7c8a86ffbb 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.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 */
 
@@ -37,7 +35,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/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index e4b3107138a..9ad8b41e4e6 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.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 */
 
@@ -46,7 +44,7 @@ private:
   int shutdown_received_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h
index 11bbc89cc91..e8c66c70768 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.h
+++ b/TAO/tests/Client_Leaks/Startup_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 */
 
@@ -44,7 +42,7 @@ private:
   Test::Process_var process_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h
index 76725c11cf1..b5437057846 100644
--- a/TAO/tests/Collocation_Tests/Hello.h
+++ b/TAO/tests/Collocation_Tests/Hello.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:
   ACE_thread_t thr_id_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h
index 9097ddddbb4..ac59ba89dc2 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.h
+++ b/TAO/tests/Connect_Strategy_Test/Hello.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 */
 
@@ -37,7 +35,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/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h
index 639e309a4fe..ba4d2279cf0 100644
--- a/TAO/tests/Connection_Purging/test_i.h
+++ b/TAO/tests/Connection_Purging/test_i.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 */
 
@@ -29,7 +27,7 @@ public:
 private:
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
index bd5fbd2c24d..c3bc225ebd9 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h
+++ b/TAO/tests/Crash_On_Write/Oneway_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 */
 
@@ -29,7 +27,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/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 */
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
index 239c7a434f0..4f8f16ed758 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/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 */
 
@@ -43,7 +41,7 @@ public:
   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/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index 9097ddddbb4..ac59ba89dc2 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.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 */
 
@@ -37,7 +35,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/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h
index ce6c8171c95..e4fae38b6bf 100755
--- a/TAO/tests/ICMG_Any_Bug/Hello.h
+++ b/TAO/tests/ICMG_Any_Bug/Hello.h
@@ -10,9 +10,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 */
 
@@ -40,7 +38,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/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
index d308a0aac1a..35b13b307a5 100755
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.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 */
 
@@ -31,7 +29,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
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 */
 
diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h
index 4773d8ea5fd..1bdd768901d 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.h
+++ b/TAO/tests/MT_BiDir/Receiver_i.h
@@ -9,9 +9,7 @@
 #include "ReceiverS.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 */
 
@@ -41,7 +39,7 @@ private:
   CORBA::ULong byte_count_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index 124a7e7fa87..8b9c159b190 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/Sender_i.h
@@ -9,9 +9,7 @@
 #include "SenderS.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 */
 
@@ -58,7 +56,7 @@ private:
   Receiver::Payload payload_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index 486defeb257..b643abccbbb 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_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 */
 
@@ -38,7 +36,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/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 */
 
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.h b/TAO/tests/ORB_shutdown/Foo_Bar.h
index b477e2d31b7..5a6037f5e4c 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.h
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.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 */
 
@@ -34,7 +32,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/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 8a5b068bf7d..cdea1c0d380 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -89,7 +87,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h
index 2b487101520..19a884cd55d 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.h
+++ b/TAO/tests/ORT/ObjectReferenceFactory.h
@@ -21,9 +21,7 @@
 #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 */
 
@@ -83,7 +81,7 @@ private:
 };
 
 
-#if defined (_MSC_VER) && (_MSC_VER >= 1200)
+#if defined (_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h
index 573d872ac37..932eabdb5df 100644
--- a/TAO/tests/ORT/ServerORBInitializer.h
+++ b/TAO/tests/ORT/ServerORBInitializer.h
@@ -23,9 +23,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -67,7 +65,7 @@ public:
 };
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h
index a501741d104..2ed5ff811d1 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.h
+++ b/TAO/tests/ORT/ServerRequestInterceptor.h
@@ -31,9 +31,7 @@
 
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -119,7 +117,7 @@ private:
 };
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 9d893017966..72784ad6f93 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -20,9 +20,7 @@
 #include "OLT_Export.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -53,7 +51,7 @@ private:
   static CORBA::Long instance_count_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index 45037b9530e..229ae6f51d9 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_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::Oneway_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/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index ea5be58992d..5c9145daf4c 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_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/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
index df019e34d43..9649347aec3 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_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 */
 
@@ -62,7 +60,7 @@ private:
   CORBA::ULong no_calls_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
index 3d3a0815294..661fdf27814 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_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 */
 
@@ -63,7 +61,7 @@ private:
   CORBA::Short active_objects_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
index 0503a62731b..f66e4e505c2 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
@@ -18,9 +18,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -46,7 +44,7 @@ private:
   // The type of interceptor that this initializer will create
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
index 97dbf2f47ab..3ef96adeea8 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
@@ -18,9 +18,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -45,7 +43,7 @@ private:
   int interceptor_type_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
index 31b3772fc05..6d8a4f53ae3 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
@@ -15,9 +15,7 @@
 #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 */
 
@@ -391,7 +389,7 @@ private:
   const char *myname_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index ade5e43c844..8ea41d53689 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -18,9 +18,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +40,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/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index d3b9f26fece..d5aef56e289 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -19,9 +19,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -52,7 +50,7 @@ private:
   Echo_Server_Request_Interceptor * server_interceptor_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.h b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.h
index 30f1e4d1b24..eccf3ba839c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.h
@@ -14,9 +14,7 @@
 #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 */
 
@@ -127,7 +125,7 @@ private:
   CORBA::Object_ptr forward_location_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
index 99dcd17554f..baa5f1e153a 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
@@ -21,9 +21,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -43,7 +41,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/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 6b44c0545ce..32d48f61eb3 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -15,9 +15,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -131,7 +129,7 @@ private:
   const char *myname_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 04fc0d3e50e..3e9beabf5b5 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -15,9 +15,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -39,7 +37,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/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
index 631ffae2aef..a31854cfe69 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
@@ -12,9 +12,7 @@
 #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 */
 
@@ -118,7 +116,7 @@ private:
   const char *myname_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index 9251b74409c..9a8cfc12dce 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -20,9 +20,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +40,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/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index 531ec809ebe..1c6b82c715f 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -20,9 +20,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +40,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/Portable_Interceptors/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
index 3fb6f5c392a..08e31458494 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
@@ -13,9 +13,7 @@
 #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 */
 
@@ -136,7 +134,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
index 8dbd7dca3e2..635a6ac9fa2 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
@@ -31,9 +31,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -53,7 +51,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/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index 37994c74c0e..fd92d7afc55 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -28,9 +28,7 @@
 #include "tao/CORBA_String.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -119,7 +117,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index 46fab467bd4..273bfca7145 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -31,9 +31,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -69,7 +67,7 @@ private:
   PortableInterceptor::ServerRequestInterceptor_var server_interceptor_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index 3fbc6234d29..9117858d7d3 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -130,7 +128,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index d58e2dc3541..615c249fe84 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -104,7 +102,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
index 01a5cc2bce6..334a3cbfe65 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -69,7 +67,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 16e97a00ad7..0440e38ffa5 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -104,7 +102,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
index ed0a8ce161f..384f57b8503 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -69,7 +67,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
index bace43754f7..f30aa4ef1f8 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
@@ -29,9 +29,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -64,7 +62,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
index b7042294fdf..fb51c80f274 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -110,7 +108,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
index d2cafd3d2c4..a9105a13a63 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
@@ -23,9 +23,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -76,7 +74,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
index c462e78c815..1b5df1908e1 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
@@ -23,9 +23,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -107,7 +105,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
index e51a7cab1a7..80e5a1812ce 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
@@ -23,9 +23,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -100,7 +98,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
index 9057ba80593..52d5daaa7df 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -77,7 +75,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index 0ad9023de33..6dd03706a71 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -106,7 +104,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index cb8ce431dd2..503c7390a10 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -107,7 +105,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
index 58f5cecd676..56946bab0ed 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
@@ -25,9 +25,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -65,7 +63,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
index c11cbdadad3..47a0b3eef41 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
@@ -26,9 +26,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -69,7 +67,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
index e40208a3d21..797dba654b6 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
@@ -28,9 +28,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -57,7 +55,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
index 84b3468b286..b9f3a729894 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
@@ -28,9 +28,7 @@
 #include "Request_Interceptor.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -99,7 +97,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
index e8b1bf43936..b1261adaa35 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
@@ -29,9 +29,7 @@
 #include "tao/CORBA_String.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -83,7 +81,7 @@ protected:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
index 479e672b76c..ba25b3e7cf0 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
@@ -28,9 +28,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -57,7 +55,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
index 9a62c6546e1..c7a6053fa86 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
@@ -29,9 +29,7 @@
 
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -107,7 +105,7 @@ private:
   CORBA::ULong scenario_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index ade5e43c844..8ea41d53689 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
@@ -18,9 +18,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +40,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/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index 0d8b69a6c33..ff825e7d172 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -18,9 +18,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +40,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/Portable_Interceptors/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
index c1dc2439716..1b04bc02105 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
@@ -14,9 +14,7 @@
 #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 */
 
@@ -120,7 +118,7 @@ private:
   const char *myname_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
index ade5e43c844..8ea41d53689 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
@@ -18,9 +18,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +40,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/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index a82ac39dc31..e107f6fe6c1 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -14,9 +14,7 @@
 #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 */
 
@@ -74,7 +72,7 @@ private:
 };
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index d859e37924b..26e93bd8e31 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_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 */
 
@@ -40,7 +38,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/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index 4754015f3e1..f70ce4239f6 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.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 */
 
@@ -34,7 +32,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/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h
index 6b53ffee707..6cf7de34f78 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.h
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.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 */
 
@@ -69,7 +67,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/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h
index 97fa42e34f3..2d192ebdc71 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.h
+++ b/TAO/tests/Server_Connection_Purging/Test_i.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 */
 
@@ -29,7 +27,7 @@ public:
 private:
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index 0d25556f918..7b763e3c2ba 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_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 */
 
@@ -37,7 +35,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/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h
index 9097ddddbb4..ac59ba89dc2 100644
--- a/TAO/tests/Server_Port_Zero/Hello.h
+++ b/TAO/tests/Server_Port_Zero/Hello.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 */
 
@@ -37,7 +35,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/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index 13cb6757824..f3fe91b9a7c 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.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 is_done_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */