summaryrefslogtreecommitdiff
path: root/TAO/tao/CONV_FRAMES_T.h
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-11-22 01:25:05 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-11-22 01:25:05 +0000
commitac7638c968037d3661d857e5b5ceda5551371462 (patch)
tree54038bfacd793244ca1dbf9de8de1b5f6a34d891 /TAO/tao/CONV_FRAMES_T.h
parent80c51449a637b1d7245eabc53d483c5e82f9b8be (diff)
downloadATCD-ac7638c968037d3661d857e5b5ceda5551371462.tar.gz
ChangeLogTag:Sun Nov 21 19:15:10 1999 Darrell Brunsch <brunsch@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/CONV_FRAMES_T.h')
-rw-r--r--TAO/tao/CONV_FRAMES_T.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/TAO/tao/CONV_FRAMES_T.h b/TAO/tao/CONV_FRAMES_T.h
index dc201a3a1c6..79acf96c315 100644
--- a/TAO/tao/CONV_FRAMES_T.h
+++ b/TAO/tao/CONV_FRAMES_T.h
@@ -21,7 +21,9 @@
#define TAO_CONV_FRAMES_T_H
#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
#pragma warning(disable:4250)
#endif /* _MSC_VER */
@@ -40,7 +42,7 @@
#pragma implementation ("CONV_FRAMES_T.cpp")
#endif /* defined REQUIRED PRAGMA */
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
#pragma warning(pop)
#endif /* _MSC_VER */