ChangeLogTag: Tue Jan 4 09:42:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 14 insertions, 26 deletions

diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 13b772ee54d..a16feb4bfde 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -30,9 +30,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 */
 
@@ -77,7 +75,7 @@ private:
 # include "RT_Current.i"
 #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/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index 33c0d8985e4..c12409e8cd0 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -33,9 +33,7 @@
 #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
 #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 @@ protected:
 };
 #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index 07fddcde91d..1846c41e36d 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -33,9 +33,7 @@
 #endif
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -160,14 +158,14 @@ public:
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException ));
 
-  RTCORBA::UnixDomainProtocolProperties_ptr 
+  RTCORBA::UnixDomainProtocolProperties_ptr
   create_unix_domain_protocol_properties (
                                           CORBA::Long send_buffer_size,
                                           CORBA::Long recv_buffer_size
                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-    
-  RTCORBA::SharedMemoryProtocolProperties_ptr 
+
+  RTCORBA::SharedMemoryProtocolProperties_ptr
   create_shared_memory_protocol_properties (
                                             CORBA::Long send_buffer_size,
                                             CORBA::Long recv_buffer_size,
@@ -179,14 +177,14 @@ public:
                                             const char *mmap_lockname
                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-    
-  RTCORBA::UserDatagramProtocolProperties_ptr 
+
+  RTCORBA::UserDatagramProtocolProperties_ptr
   create_user_datagram_protocol_properties (
                                             CORBA::Boolean enable_network_priority
                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-      
-  RTCORBA::StreamControlProtocolProperties_ptr 
+
+  RTCORBA::StreamControlProtocolProperties_ptr
   create_stream_control_protocol_properties (
                                              CORBA::Long send_buffer_size,
                                              CORBA::Long recv_buffer_size,
@@ -196,7 +194,7 @@ public:
                                              CORBA::Boolean enable_network_priority
                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
   /// Create a RTCORBA threadpool to manage a set of threads without lanes.
   virtual RTCORBA::ThreadpoolId
   create_threadpool (CORBA::ULong stacksize,
@@ -322,7 +320,7 @@ protected:
 #include "RT_ORB.i"
 #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/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 88950e2394d..d64f3a8ccf9 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -34,9 +34,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 */
 
@@ -123,7 +121,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
index 5be40291ac2..078bdfdd440 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h
@@ -33,9 +33,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:
                      CORBA::PolicyError));
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index 211a25b2a35..4dd2533c099 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -33,9 +33,7 @@
 #include "ace/SString.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -902,7 +900,7 @@ protected:
 #include "RT_Policy_i.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */