summaryrefslogtreecommitdiff
path: root/TAO/tao/RTCORBA/RT_Current.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/RTCORBA/RT_Current.h')
-rw-r--r--TAO/tao/RTCORBA/RT_Current.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 13b772ee54d..eed5b7e39f9 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 */
@@ -72,12 +70,7 @@ private:
};
-
-#if defined (__ACE_INLINE__)
-# include "RT_Current.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */