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

23 files changed, 34 insertions, 80 deletions

diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index fcc22468ad3..3dd23fc37a2 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.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 */
 
@@ -80,7 +78,7 @@ private:
   TAO::BufferingConstraint buffering_constraint_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index c50b68601d7..e44b93b2dac 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -27,9 +27,7 @@
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -286,7 +284,7 @@ private:
 #  include "ClientRequestInfo.inl"
 # endif  /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/CodecFactory.h b/TAO/tao/CodecFactory.h
index d07f88c1cae..9a08564f50d 100644
--- a/TAO/tao/CodecFactory.h
+++ b/TAO/tao/CodecFactory.h
@@ -26,9 +26,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 */
 
@@ -75,7 +73,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/CodecFactory_ORBInitializer.h b/TAO/tao/CodecFactory_ORBInitializer.h
index 5beec042708..29b42b0fb78 100644
--- a/TAO/tao/CodecFactory_ORBInitializer.h
+++ b/TAO/tao/CodecFactory_ORBInitializer.h
@@ -27,9 +27,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 */
 
@@ -58,7 +56,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 6e239530333..e4b5e99d949 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.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(push)
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
@@ -89,7 +87,7 @@ private:
   TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src);
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 5abb47f8540..db9b893ec58 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.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(push)
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
@@ -121,7 +119,7 @@ private:
   TAO_DynAny_i &operator= (const TAO_DynAny_i &src);
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index c24bb5f20cd..d8b6120e9cd 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -27,9 +27,7 @@
 #include "ace/Containers.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 */
 
@@ -161,7 +159,7 @@ private:
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 3e5b5b0eafd..60a15b01d91 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -22,9 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #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 */
 
@@ -548,7 +546,7 @@ private:
       ));
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 7f3b8b0ed35..57c68a2f69f 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -27,9 +27,7 @@
 #include "ace/Containers.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 */
 
@@ -152,7 +150,7 @@ private:
   CORBA::ULong value_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index 8f88136c047..4c0b4f8880a 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -27,9 +27,7 @@
 #include "ace/Containers.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 */
 
@@ -174,7 +172,7 @@ private:
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index c8e49068fc7..9301e632a5e 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -27,9 +27,7 @@
 #include "ace/Containers.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 */
 
@@ -181,7 +179,7 @@ private:
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index bbd7fd651de..3052ca6167e 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.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(push)
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
@@ -210,7 +208,7 @@ private:
   CORBA::ULong member_slot_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/FloatSeqS.h b/TAO/tao/FloatSeqS.h
index dbe54b5b54a..df027a33fc6 100644
--- a/TAO/tao/FloatSeqS.h
+++ b/TAO/tao/FloatSeqS.h
@@ -44,9 +44,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -59,17 +57,17 @@
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
 // w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // .\be\be_codegen.cpp:1014
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index 61b05ca2a86..0666e0ef6b7 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -31,9 +31,7 @@
 #include "IORC.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -159,7 +157,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/PICurrent.h b/TAO/tao/PICurrent.h
index 15b00f2dcc8..f0b302b673e 100644
--- a/TAO/tao/PICurrent.h
+++ b/TAO/tao/PICurrent.h
@@ -30,9 +30,7 @@
 
 #if defined(_MSC_VER)
 
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
+# pragma warning(push)
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -241,7 +239,7 @@ namespace TAO
 # include "PICurrent.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/PICurrent_ORBInitializer.h b/TAO/tao/PICurrent_ORBInitializer.h
index a2d0062b623..4921033026a 100644
--- a/TAO/tao/PICurrent_ORBInitializer.h
+++ b/TAO/tao/PICurrent_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 */
 
@@ -68,7 +66,7 @@ public:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 1f5597a475b..32a5b53bb0f 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -33,9 +33,7 @@
 #include "tao/Policy_Set.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -149,7 +147,7 @@ public:
   TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &);
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
index c27ac418766..15b069094dd 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
@@ -30,9 +30,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 */
 
@@ -59,7 +57,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeC.h b/TAO/tao/RTScheduling/RTScheduler_includeC.h
index faf1dbd8c9a..c1624376b4d 100644
--- a/TAO/tao/RTScheduling/RTScheduler_includeC.h
+++ b/TAO/tao/RTScheduling/RTScheduler_includeC.h
@@ -55,9 +55,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -86,7 +84,7 @@ namespace TAO
 // TAO_IDL - Generated from
 // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1050
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Strategies/sciop_endpoints.h b/TAO/tao/Strategies/sciop_endpoints.h
index 96f0bbf95da..5b817a1a425 100644
--- a/TAO/tao/Strategies/sciop_endpoints.h
+++ b/TAO/tao/Strategies/sciop_endpoints.h
@@ -36,9 +36,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -207,7 +205,7 @@ TAO_Strategies_Export CORBA::Boolean operator>> (
 #include "sciop_endpoints.i"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Strategies/uiop_endpoints.h b/TAO/tao/Strategies/uiop_endpoints.h
index 78c78caccd1..fbe8bcc94bc 100644
--- a/TAO/tao/Strategies/uiop_endpoints.h
+++ b/TAO/tao/Strategies/uiop_endpoints.h
@@ -38,9 +38,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -207,7 +205,7 @@ TAO_Strategies_Export CORBA::Boolean operator>> (
 #include "uiop_endpoints.i"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index 76a12822040..660e5ad025b 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.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 */
 
@@ -296,7 +294,7 @@ private:
   TAO_TypeCodeFactory_i &operator= (const TAO_TypeCodeFactory_i &src);
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/orb_typesS.h b/TAO/tao/orb_typesS.h
index 046965b76e8..72ed72bbffd 100644
--- a/TAO/tao/orb_typesS.h
+++ b/TAO/tao/orb_typesS.h
@@ -44,9 +44,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -66,7 +64,7 @@ namespace POA_CORBA
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */