summaryrefslogtreecommitdiff
path: root/TAO/CIAO/DAnCE/ciao/Servant_Activator.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/CIAO/DAnCE/ciao/Servant_Activator.h')
-rw-r--r--TAO/CIAO/DAnCE/ciao/Servant_Activator.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Activator.h b/TAO/CIAO/DAnCE/ciao/Servant_Activator.h
index 4b4fbf65130..a9f75028a67 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Activator.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Activator.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 */
@@ -100,5 +98,9 @@ namespace CIAO
};
}
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
#include /**/ "ace/post.h"
#endif /*CIAO_SERVANT_ACTIVATOR_H*/