diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 8db09cbd64b..d1ab3e4910b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -22,13 +22,22 @@ #include "orbsvcs/CosNotifyFilterS.h" #include "FilterFactory.h" +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + /** * @class TAO_NS_ETCL_FilterFactory * * @brief * */ -class TAO_Notify_Export TAO_NS_ETCL_FilterFactory : public POA_CosNotifyFilter::FilterFactory, public TAO_NS_FilterFactory +class TAO_Notify_Export TAO_NS_ETCL_FilterFactory : public virtual PortableServer::RefCountServantBase + , public virtual POA_CosNotifyFilter::FilterFactory + , public TAO_NS_FilterFactory { public: /// Constuctor @@ -61,6 +70,10 @@ public: )); }; +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + ACE_FACTORY_DECLARE (TAO_Notify, TAO_NS_ETCL_FilterFactory) #if defined (__ACE_INLINE__) |