summaryrefslogtreecommitdiff
path: root/TAO/tao/PollableC.h
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-11-09 20:47:31 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-11-09 20:47:31 +0000
commitc69c20698df120bf1b3bbf23695a1ba4f0e3d299 (patch)
tree32b20ac2791e4c36ca07fbce9ecb3ec1814854d9 /TAO/tao/PollableC.h
parent225677cb1722a669554aa363ccd705e23812caf8 (diff)
downloadATCD-c69c20698df120bf1b3bbf23695a1ba4f0e3d299.tar.gz
ChangeLogTag:Tue Nov 9 14:34:17 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
Diffstat (limited to 'TAO/tao/PollableC.h')
-rw-r--r--TAO/tao/PollableC.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 9cf9f68fdf0..3b3c7584bde 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -38,6 +38,7 @@
#endif
#define TAO_EXPORT_MACRO TAO_Export
#if defined(_MSC_VER)
+#pragma warning(push)
#pragma warning(disable:4250)
#endif /* _MSC_VER */
@@ -434,7 +435,7 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_PollableSet::Unknown
#endif /* defined INLINE */
#if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
#endif /* _MSC_VER */
#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */