summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-11 18:19:26 +0000
committerpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-11 18:19:26 +0000
commit8e2217a98ea0c7e095c47249c5980a8946c0917d (patch)
treeb09ac551d87e83e764bd9d4f8cb1e9686a0577eb
parent244c4e002bcd8e9f167d25277b3e63ae78008254 (diff)
downloadATCD-8e2217a98ea0c7e095c47249c5980a8946c0917d.tar.gz
Tue Jul 11 13:18:42 2000 Pradeep Gore <pradeep@cs.wustl.edu>
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_T.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index bd95dc85461..15ded65bd3c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -28,6 +28,13 @@
// TAO_Trader
// *************************************************************
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
class TAO_Trader : public TAO_Trader_Base
//
@@ -256,5 +263,9 @@ public:
#include "Trader_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
#include "ace/post.h"
#endif /* ACE_TRADER_H */