summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/Object_Adapter.h
diff options
context:
space:
mode:
authorbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-12 00:21:56 +0000
committerbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-12 00:21:56 +0000
commit9a0a64c7c778f31d32772bdf8770492e5936027b (patch)
tree88c28ab1295e9ab6c6c0c8d2d67fbb910b87123c /TAO/tao/PortableServer/Object_Adapter.h
parentfa41aa70999dfd6895b8aa198f7d8b1119a48bcf (diff)
downloadATCD-9a0a64c7c778f31d32772bdf8770492e5936027b.tar.gz
ChangeLogTag: Mon Feb 11 18:20:33 2002 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/PortableServer/Object_Adapter.h')
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index b75ba21b3c3..f2e9d609fb1 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -789,6 +789,10 @@ ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory)
// ****************************************************************
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
#if defined (__ACE_INLINE__)
# include "Object_Adapter.i"
#endif /* __ACE_INLINE__ */