diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-04 08:55:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-04 08:55:12 +0000 |
| commit | af4bebb78b076758af5be7bc907fbb709ec5a227 (patch) | |
| tree | 895ae46c3a981a6a44e800f560ac08464b111aa9 | |
| parent | 15c8eb0d50e1c227cb032fa0697e23bfd78ac47b (diff) | |
| download | ATCD-af4bebb78b076758af5be7bc907fbb709ec5a227.tar.gz | |
ChangeLogTag: Mon Jul 4 08:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
166 files changed, 168 insertions, 985 deletions
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h index 30a397b9899..b71c32fe9df 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h @@ -23,11 +23,10 @@ /// Implement the Rountrip interface class AMH_Servant : public virtual POA_Test::AMH_Roundtrip - , public virtual PortableServer::RefCountServantBase { public: AMH_Servant (CORBA::ORB_ptr orb); - + virtual ~AMH_Servant (void); /// parse arguments from command line for sleep time diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h index b64fde75388..b50b1b5b9ce 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h @@ -29,16 +29,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class Content_Iterator_i : - public virtual POA_Web_Server::Content_Iterator, - public virtual PortableServer::RefCountServantBase + public virtual POA_Web_Server::Content_Iterator { // = TITLE // Implement the Web_Server::Content_Iterator interface. @@ -91,8 +83,4 @@ private: // for debugging purposes.) }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* CONTENT_ITERATOR_I_H */ diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h index 121dde5a170..c4f9b8d6dad 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h @@ -29,16 +29,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class Iterator_Handler - : public virtual POA_Web_Server::AMI_Content_IteratorHandler, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Web_Server::AMI_Content_IteratorHandler { // = TITLE // The AMI reply handler for replies from the Content_Iterator. @@ -142,8 +134,4 @@ private: // decremented when file retrieval has completed. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* ITERATOR_HAHNDLER_H */ diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h index ab2628a12d7..96a560fc5ec 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h @@ -29,16 +29,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class Callback_Handler - : public virtual POA_Web_Server::AMI_CallbackHandler, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Web_Server::AMI_CallbackHandler { // = TITLE // Class that asynchronously sends chunks of data to the @@ -143,8 +135,4 @@ private: // Flag that indicates all chunks of data have been sent. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* CALLBACK_HANDLER_H */ diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h index 80894eccbf5..38ca7d43272 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h @@ -28,17 +28,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - // Implement the Web_Server::Callback interface. class Callback_i : - public virtual POA_Web_Server::Callback, - public virtual PortableServer::RefCountServantBase + public virtual POA_Web_Server::Callback { // = TITLE // Implement the Web_Server::Callback interface. @@ -132,8 +124,4 @@ private: // decremented when file retrieval has completed. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* CALLBACK_I_H */ diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h index 6eef4196b11..26093e6ccf0 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h @@ -26,19 +26,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - // Forward declaration class Callback_i; class Push_Iterator_Handler - : public virtual POA_Web_Server::AMI_Iterator_FactoryHandler, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Web_Server::AMI_Iterator_FactoryHandler { // = TITLE // Implement the Web_Server::Iterator_Factory AMI Reply Handler. @@ -112,8 +104,4 @@ private: // Reference to this Reply Handler's self. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* PUSH_ITERATOR_HANDLER_H */ diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h index 6db97026983..7a2069fa54a 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h @@ -29,16 +29,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class Content_Iterator_i : - public virtual POA_Web_Server::Content_Iterator, - public virtual PortableServer::RefCountServantBase + public virtual POA_Web_Server::Content_Iterator { // = TITLE // Implement the Web_Server::Content_Iterator interface. @@ -91,8 +83,4 @@ private: // for debugging purposes.) }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* CONTENT_ITERATOR_I_H */ diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h index 568f798f1b5..7e421f390a3 100644 --- a/TAO/examples/Load_Balancing/Identity_i.h +++ b/TAO/examples/Load_Balancing/Identity_i.h @@ -17,14 +17,8 @@ #include "IdentityS.h" -// This is to remove "inherits via dominance" warnings from MSVC. -#if defined (_MSC_VER) -# pragma warning (disable : 4250) -#endif /* _MSC_VER */ - class Identity_i : - public virtual POA_Identity, - public virtual PortableServer::RefCountServantBase + public virtual POA_Identity { // = TITLE // This class implements Identity.idl interface. diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index 643fbae178e..2699cc88f99 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -27,14 +27,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -#if defined (_MSC_VER) -# pragma warning (disable : 4250) -#endif /* _MSC_VER */ - class Object_Group_Factory_i : - public virtual POA_Load_Balancer::Object_Group_Factory, - public virtual PortableServer::RefCountServantBase + public virtual POA_Load_Balancer::Object_Group_Factory { // = TITLE // This class implements Load_Balancer::Object_Group_Factory idl @@ -143,8 +137,7 @@ private: // Map containing all round robin <Object_Group>s created by this factory. }; -class Object_Group_i : public virtual POA_Load_Balancer::Object_Group, - public virtual PortableServer::RefCountServantBase +class Object_Group_i : public virtual POA_Load_Balancer::Object_Group { // = TITLE diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h index 1a7df37cfbc..3712d79c9f1 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h @@ -17,14 +17,8 @@ #include "IdentityS.h" -// This is to remove "inherits via dominance" warnings from MSVC. -#if defined (_MSC_VER) -# pragma warning (disable : 4250) -#endif /* _MSC_VER */ - class Identity_i : - public virtual POA_Identity, - public virtual PortableServer::RefCountServantBase + public virtual POA_Identity { // = TITLE // This class implements Identity.idl interface. diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index eefa663254f..119c2ccb0e0 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -30,19 +30,13 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -#if defined (_MSC_VER) -# pragma warning (disable : 4250) -#endif /* _MSC_VER */ - typedef ACE_Allocator_Adapter <ACE_Malloc<ACE_MMAP_MEMORY_POOL, TAO_SYNCH_MUTEX> > ALLOCATOR; typedef ACE_Hash_Map_With_Allocator<char *, char *> HASH_MAP; class Object_Group_Factory_i : - public virtual POA_Load_Balancer::Object_Group_Factory, - public virtual PortableServer::RefCountServantBase + public virtual POA_Load_Balancer::Object_Group_Factory { // = TITLE // This class implements Load_Balancer::Object_Group_Factory idl @@ -184,8 +178,8 @@ private: }; -class Object_Group_i : public virtual POA_Load_Balancer::Object_Group, - public virtual PortableServer::RefCountServantBase +class Object_Group_i + : public virtual POA_Load_Balancer::Object_Group { // = TITLE diff --git a/TAO/examples/POA/Forwarding/test_i.h b/TAO/examples/POA/Forwarding/test_i.h index 6386fb43d0e..4a78980de85 100644 --- a/TAO/examples/POA/Forwarding/test_i.h +++ b/TAO/examples/POA/Forwarding/test_i.h @@ -14,15 +14,10 @@ #include "testS.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class ServantActivator; -class test_i : public virtual PortableServer::RefCountServantBase, - public virtual POA_test +class test_i : + public virtual POA_test { public: test_i (CORBA::ORB_ptr orb_ptr, @@ -51,6 +46,3 @@ protected: CORBA::Long value_; }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index 7cdb2a32c12..563abde30ed 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -25,7 +25,7 @@ class ACE_Arg_Shifter; * @brief Implements a Job that performs some cpu bound work. * */ -class activity_Export Job_i : public POA_Job, public virtual PortableServer::RefCountServantBase +class activity_Export Job_i : public POA_Job { public: /// Constructor diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h index 3210a095b31..7aa0756f128 100644 --- a/TAO/examples/RTScheduling/Job_i.h +++ b/TAO/examples/RTScheduling/Job_i.h @@ -26,7 +26,7 @@ class DT_Creator; * @brief Implements a Job that performs some cpu bound work. * */ -class Job_i : public POA_Job, public virtual PortableServer::RefCountServantBase +class Job_i : public POA_Job { public: /// Constructor diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h index fc2e720d6df..2957a71a68d 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.h +++ b/TAO/examples/Simple/time-date/Time_Date_i.h @@ -24,8 +24,7 @@ #include "Time_DateS.h" class Time_Date_i - : public POA_Time_Date, - public PortableServer::RefCountServantBase + : public POA_Time_Date { // = TITLE // Time_Date object implementation. diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 4ce246a321a..a8d0b7f1477 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -39,7 +39,6 @@ namespace TAO */ class TAO_ReplicationManagerLib_Export FT_FaultConsumer : public virtual POA_CosNotifyComm::StructuredPushConsumer - , public virtual PortableServer::RefCountServantBase { ////////////////////// diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index 3536274bd0d..7914745a0e5 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -76,8 +76,7 @@ namespace TAO * registry is queried to find factories that can create the member. */ class FT_ReplicationManager - : public virtual POA_FT::ReplicationManager, - public virtual PortableServer::RefCountServantBase + : public virtual POA_FT::ReplicationManager { ////////////////////// diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index 9a8dc019eae..d592146fbb7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -30,7 +30,6 @@ */ class ImR_Iterator : public POA_ImplementationRepository::ServerInformationIterator - , public PortableServer::RefCountServantBase { public: ImR_Iterator (CORBA::ULong n, Locator_Repository& repo, PortableServer::POA_ptr poa); diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h index 2ac8a490eef..f1a137b5372 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h @@ -29,14 +29,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_CosEventChannelFactory_i : - public virtual POA_CosEventChannelFactory::ChannelFactory, - public virtual PortableServer::RefCountServantBase + public virtual POA_CosEventChannelFactory::ChannelFactory { public: // = Initialization and termination code. @@ -120,10 +114,6 @@ class TAO_CosEventChannelFactory_i : // The naming context to use. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* TAO_COSEVENTCHANNELFACTORY_I_H */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index 2763a565ba6..e6142c993ef 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -26,14 +26,8 @@ #include "orbsvcs/CosEventChannelAdminS.h" #include "ProxyPushSupplier_i.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_RTEC_COSEC_Export TAO_CosEC_ConsumerAdmin_i : - public virtual POA_CosEventChannelAdmin::ConsumerAdmin, - public virtual PortableServer::RefCountServantBase + public virtual POA_CosEventChannelAdmin::ConsumerAdmin { // = TITLE // class TAO_CosEC_ConsumerAdmin_i implements the ConsumerAdmin interface. @@ -71,9 +65,5 @@ private: // this class. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* CONSUMERADMIN_I_H */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h index bedb4160049..2738ff890fe 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h @@ -27,16 +27,10 @@ #include "orbsvcs/Event_Utilities.h" #include "rtec_cosec_export.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_CosEC_EventChannel_i; class TAO_RTEC_COSEC_Export CosEC_ServantBase : - public virtual POA_CosEventChannelAdmin::EventChannel, - public virtual PortableServer::RefCountServantBase + public virtual POA_CosEventChannelAdmin::EventChannel { // = TITLE // A generic servant base class. @@ -159,10 +153,5 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase : // event id pairs. }; - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* TAO_COSEVENT_UTILITIES_H */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h index 47bc1db1f12..74f25ca3ec2 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h @@ -27,14 +27,8 @@ #include "ConsumerAdmin_i.h" #include "SupplierAdmin_i.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_RTEC_COSEC_Export TAO_CosEC_EventChannel_i : -public virtual POA_CosEventChannelAdmin::EventChannel, -public virtual PortableServer::RefCountServantBase + public virtual POA_CosEventChannelAdmin::EventChannel { // = TITLE // class TAO_CosEC_EventChannel_i implements the standard Cos EventChannel @@ -94,9 +88,5 @@ private: // activating the servant in the ORB. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* EVENTCHANNEL_I_H */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h index 5db14a077fa..b780b88d90a 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h @@ -26,16 +26,10 @@ #include "orbsvcs/CosEventChannelAdminS.h" #include "rtec_cosec_export.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_CosEC_PushSupplierWrapper; class TAO_RTEC_COSEC_Export TAO_CosEC_ProxyPushConsumer_i : - public virtual POA_CosEventChannelAdmin::ProxyPushConsumer, - public virtual PortableServer::RefCountServantBase + public virtual POA_CosEventChannelAdmin::ProxyPushConsumer { // = TITLE // class TAO_CosEC_ProxyPushConsumer_i implements the ProxyPushConsumer @@ -89,9 +83,5 @@ private: // The Rtec PushSupplier wrapper used by the Rtec ProxyPushConsumer. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* _PROXYPUSHCONSUMER_I_H */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h index 786f6b7989f..199a596c0bf 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h @@ -26,16 +26,10 @@ #include "orbsvcs/CosEventChannelAdminC.h" #include "rtec_cosec_export.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_CosEC_PushConsumerWrapper; class TAO_RTEC_COSEC_Export TAO_CosEC_ProxyPushSupplier_i : - public POA_CosEventChannelAdmin::ProxyPushSupplier, - public virtual PortableServer::RefCountServantBase + public POA_CosEventChannelAdmin::ProxyPushSupplier { // = TITLE // class ProxyPushSupplier-i implements the ProxyPushConsumer interface. @@ -78,9 +72,5 @@ private: // The Rtec PushConsumer wrapper used by the Rtec ProxyPushSupplier. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* _PROXYPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index 7faa16cea39..7642b282601 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -26,14 +26,8 @@ #include "orbsvcs/CosEventChannelAdminC.h" #include "ProxyPushConsumer_i.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_RTEC_COSEC_Export TAO_CosEC_SupplierAdmin_i : - public virtual POA_CosEventChannelAdmin::SupplierAdmin, - public virtual PortableServer::RefCountServantBase + public virtual POA_CosEventChannelAdmin::SupplierAdmin { // = TITLE // class TAO_CosEC_SupplierAdmin_i implements the SupplierAdmin interface. @@ -73,9 +67,5 @@ private: // this class. }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* SUPPLIER_ADMIN_I_H */ diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h index 5f865cd0d65..5c45021ce6e 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h @@ -12,7 +12,6 @@ class Manager_i : public virtual POA_Manager - , public virtual PortableServer::RefCountServantBase { public: Manager_i (long retryCount); diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h index e0c39319f28..07730db0cbd 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h @@ -10,13 +10,14 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class Messenger_i : public virtual POA_Messenger, public virtual PortableServer::RefCountServantBase +class Messenger_i + : public virtual POA_Messenger { public: Messenger_i (CORBA::ORB_ptr orb, long instance); - + virtual ~Messenger_i (void); - + virtual CORBA::Long send_message ( ::CORBA::Long thread, @@ -24,7 +25,7 @@ public: ::CORBA::Long obj, ::CORBA::Long req ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void shutdownOrb () ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h index f3529a34305..c222ebe531e 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h @@ -13,7 +13,6 @@ // Trivial test corba object class DynServer_Export DynServer : public POA_test - , public PortableServer::RefCountServantBase { int n_; public: diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h index 657dd165f49..fb623e0852e 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h @@ -32,8 +32,7 @@ class ServerRequestInterceptor; * request arriving per second. */ class RPS_Monitor - : public virtual POA_CosLoadBalancing::LoadMonitor, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::LoadMonitor { public: diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h index 6fe8e11fed8..47bf026ce81 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h +++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h @@ -9,9 +9,7 @@ #include "Stock.h" class StockFactory - : public POA_Test::StockFactory, - public virtual PortableServer::RefCountServantBase - + : public POA_Test::StockFactory { public: StockFactory (CORBA::ORB_ptr orb, int number); diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 3b9cb99b1e5..0a125e95824 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -27,7 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class Consumer : public POA_CosNotifyComm::PushConsumer, public PortableServer::RefCountServantBase +class Consumer + : public POA_CosNotifyComm::PushConsumer { // = TITLE // Simple consumer object diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index ecba0889eaa..bd4e26f2fda 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -66,7 +66,8 @@ private: CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_; }; -class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase +class Filter_StructuredPushSupplier + : public POA_CosNotifyComm::StructuredPushSupplier { // = TITLE // Filter_StructuredPushSupplier diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 55f40c081d5..e7f9cd236a4 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -21,11 +21,6 @@ #include "orbsvcs/CosNamingC.h" #include "ace/SString.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class Filter_StructuredPushConsumer; class Filter_StructuredPushSupplier; @@ -130,7 +125,8 @@ class FilterClient }; /*****************************************************************/ -class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase +class Filter_StructuredPushConsumer + : public POA_CosNotifyComm::StructuredPushConsumer { // = TITLE // Filter_StructuredPushConsumer @@ -201,7 +197,8 @@ protected: /*****************************************************************/ -class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase +class Filter_StructuredPushSupplier + : public POA_CosNotifyComm::StructuredPushSupplier { // = TITLE // Filter_StructuredPushSupplier @@ -261,10 +258,4 @@ protected: )); }; -/*****************************************************************/ - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* NOTIFY_FILTER_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index bc7a3316a5c..0f3c3d76dd9 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -27,7 +27,8 @@ * */ -class TAO_Notify_Lanes_Consumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase +class TAO_Notify_Lanes_Consumer + : public POA_CosNotifyComm::StructuredPushConsumer { public: /// Constuctor diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index 45cb5a52007..db4a8f816cd 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -20,18 +20,14 @@ #include "ace/SString.h" #include "ace/Condition_Thread_Mutex.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - /** * @class TAO_Notify_Lanes_Supplier * * @brief Implement a Structured Supplier. * */ -class TAO_Notify_Lanes_Supplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase +class TAO_Notify_Lanes_Supplier + : public POA_CosNotifyComm::StructuredPushSupplier { public: // = Initialization and Termination code @@ -110,9 +106,5 @@ protected: int consumer_count_; }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* TAO_Notify_SUPPLIER_H */ diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index c9a3d7ad72f..126b842a4ca 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -20,11 +20,6 @@ #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class Subscribe_StructuredPushConsumer; class Subscribe_StructuredPushSupplier; @@ -119,7 +114,8 @@ class Subscribe }; /*****************************************************************/ -class Subscribe_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase +class Subscribe_StructuredPushConsumer + : public POA_CosNotifyComm::StructuredPushConsumer { // = TITLE // Subscribe_StructuredPushConsumer @@ -189,7 +185,8 @@ protected: /*****************************************************************/ -class Subscribe_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase +class Subscribe_StructuredPushSupplier + : public POA_CosNotifyComm::StructuredPushSupplier { // = TITLE // Subscribe_StructuredPushSupplier @@ -246,10 +243,4 @@ protected: )); }; -/*****************************************************************/ - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* NOTIFY_SUBSCRIBE_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index ffe7ad82f73..0af5b74d5fa 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -28,7 +28,8 @@ * */ -class TAO_Notify_ThreadPool_Consumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase +class TAO_Notify_ThreadPool_Consumer + : public POA_CosNotifyComm::StructuredPushConsumer { public: /// Constuctor diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index 7009f4ac045..e5238d0af7e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -19,11 +19,6 @@ #include "orbsvcs/CosNotifyCommC.h" #include "ace/Condition_Thread_Mutex.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - #define TEST_MAX_CONSUMERS 10 /** @@ -32,7 +27,8 @@ * @brief Implement a Structured Supplier. * */ -class TAO_Notify_ThreadPool_Supplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase +class TAO_Notify_ThreadPool_Supplier + : public POA_CosNotifyComm::StructuredPushSupplier { public: // = Initialization and Termination code @@ -121,9 +117,5 @@ protected: CosNotification::StructuredEvent event_[TEST_MAX_CONSUMERS]; }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* TAO_Notify_SUPPLIER_H */ diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h index d72d5971540..695e164312f 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h @@ -25,7 +25,6 @@ class Gateway_i : public virtual PortableServer::DynamicImplementation - , public virtual PortableServer::RefCountServantBase { public: Gateway_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 9abef1eada5..c40d26c3e1e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -41,13 +41,6 @@ #define FLOWSPEC_MAX 5 // for the Hash_Map helper classes. -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable : 4250) -#endif /* _MSC_VER */ - typedef ACE_Hash_Map_Manager <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> FlowEndPoint_Map; typedef ACE_Hash_Map_Entry <ACE_CString,AVStreams::FlowEndPoint_var> FlowEndPoint_Map_Entry; typedef ACE_Hash_Map_Iterator <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> FlowEndPoint_Map_Iterator; @@ -60,8 +53,7 @@ typedef ACE_Hash_Map_Iterator <ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> #include "AV_Core.h" class TAO_AV_Export AV_Null_MediaCtrl - : public virtual POA_Null_MediaCtrl, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Null_MediaCtrl { public: AV_Null_MediaCtrl (void); @@ -79,8 +71,7 @@ protected: */ class TAO_AV_Export TAO_Basic_StreamCtrl : public virtual POA_AVStreams::Basic_StreamCtrl, - public virtual TAO_PropertySet, - public virtual PortableServer::RefCountServantBase + public virtual TAO_PropertySet { public: @@ -179,8 +170,7 @@ protected: }; class TAO_AV_Export TAO_Negotiator - : public POA_AVStreams::Negotiator, - public virtual PortableServer::RefCountServantBase + : public POA_AVStreams::Negotiator { public: virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator, @@ -229,8 +219,7 @@ protected: */ class TAO_AV_Export TAO_StreamCtrl : public virtual POA_AVStreams::StreamCtrl, - public virtual TAO_Basic_StreamCtrl, - public virtual PortableServer::RefCountServantBase + public virtual TAO_Basic_StreamCtrl { public: @@ -355,8 +344,7 @@ protected: class TAO_AV_Export TAO_MCastConfigIf : public virtual POA_AVStreams::MCastConfigIf, - public virtual TAO_PropertySet, - public virtual PortableServer::RefCountServantBase + public virtual TAO_PropertySet { public: @@ -548,8 +536,7 @@ class TAO_Reverse_FlowSpec_Entry; */ class TAO_AV_Export TAO_StreamEndPoint : public virtual POA_AVStreams::StreamEndPoint, - public virtual TAO_Base_StreamEndPoint, - public virtual PortableServer::RefCountServantBase + public virtual TAO_Base_StreamEndPoint { public: @@ -737,8 +724,7 @@ protected: */ class TAO_AV_Export TAO_StreamEndPoint_A : public virtual POA_AVStreams::StreamEndPoint_A, - public virtual TAO_StreamEndPoint, - public virtual PortableServer::RefCountServantBase + public virtual TAO_StreamEndPoint { public: @@ -789,8 +775,7 @@ public: */ class TAO_AV_Export TAO_StreamEndPoint_B : public virtual POA_AVStreams::StreamEndPoint_B, - public virtual TAO_StreamEndPoint, - public virtual PortableServer::RefCountServantBase + public virtual TAO_StreamEndPoint { // = DESCRIPTION // The "B" side of a streamendpoint @@ -819,8 +804,7 @@ public: */ class TAO_AV_Export TAO_VDev :public virtual TAO_PropertySet, - public virtual POA_AVStreams::VDev, - public virtual PortableServer::RefCountServantBase + public virtual POA_AVStreams::VDev { public: @@ -906,8 +890,7 @@ class TAO_AV_Endpoint_Strategy; */ class TAO_AV_Export TAO_MMDevice :public virtual POA_AVStreams::MMDevice, - public virtual TAO_PropertySet, - public virtual PortableServer::RefCountServantBase + public virtual TAO_PropertySet { public: @@ -1053,8 +1036,7 @@ class TAO_FlowProducer; */ class TAO_AV_Export TAO_FlowConnection : public virtual POA_AVStreams::FlowConnection, - public virtual TAO_PropertySet, - public virtual PortableServer::RefCountServantBase + public virtual TAO_PropertySet { public: @@ -1169,8 +1151,7 @@ protected: */ class TAO_AV_Export TAO_FlowEndPoint : public virtual POA_AVStreams::FlowEndPoint, - public virtual TAO_Base_StreamEndPoint, - public virtual PortableServer::RefCountServantBase + public virtual TAO_Base_StreamEndPoint { public: @@ -1370,8 +1351,7 @@ protected: class TAO_AV_Export TAO_FlowProducer: public virtual POA_AVStreams::FlowProducer, - public virtual TAO_FlowEndPoint, - public virtual PortableServer::RefCountServantBase + public virtual TAO_FlowEndPoint { public: /// default constructor @@ -1452,8 +1432,7 @@ protected: class TAO_AV_Export TAO_FlowConsumer : public virtual POA_AVStreams::FlowConsumer, - public virtual TAO_FlowEndPoint, - public virtual PortableServer::RefCountServantBase + public virtual TAO_FlowEndPoint { public: /// default constructor. @@ -1498,8 +1477,7 @@ public: * for the specific media like camera, speaker. */ class TAO_AV_Export TAO_MediaControl - :public virtual POA_AVStreams::MediaControl, - public virtual PortableServer::RefCountServantBase + :public virtual POA_AVStreams::MediaControl { public: @@ -1550,9 +1528,5 @@ public: #include "Flows_T.h" -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* AVSTREAMS_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index 2a355a0463f..087fce312fb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -27,8 +27,7 @@ template <class T_Producer, class T_Consumer> class TAO_FDev : public virtual POA_AVStreams::FDev, - public virtual TAO_PropertySet, - public virtual PortableServer::RefCountServantBase + public virtual TAO_PropertySet { public: /// default constructor diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 743b0907022..847b38a7208 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -27,8 +27,7 @@ * initialized in the same fasion. */ class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base : - public virtual POA_RtecUDPAdmin::AddrServer, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecUDPAdmin::AddrServer { public: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index 956d89a1310..f74b4a8c969 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -45,8 +45,7 @@ * */ class TAO_RTEvent_Serv_Export TAO_ECG_Complex_Address_Server : - public virtual POA_RtecUDPAdmin::AddrServer, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecUDPAdmin::AddrServer { public: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index ed8dd5c3707..19bebc66dc6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -107,7 +107,6 @@ private: */ class Observer : public virtual POA_RtecEventChannelAdmin::Observer, - public virtual PortableServer::RefCountServantBase, public TAO_EC_Deactivated_Object { public: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index bfa6600398d..fa9c83fcbf7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -25,8 +25,7 @@ * initialized with, regardless of the header. */ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Address_Server : - public virtual POA_RtecUDPAdmin::AddrServer, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecUDPAdmin::AddrServer { public: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 15ee75ab745..e5de7f78b19 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -94,9 +94,8 @@ private: * This class connects as a supplier to an EventChannel, and supplies * to it all events it receives via UDP or Multicast. */ -class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver - : public virtual PortableServer::RefCountServantBase - , public virtual POA_RtecEventComm::PushSupplier +class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver : + public virtual POA_RtecEventComm::PushSupplier , public virtual TAO_EC_Deactivated_Object , public virtual TAO_ECG_Dgram_Handler { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 6c0d3caa02b..0f631502117 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -95,7 +95,6 @@ private: * */ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender : - public virtual PortableServer::RefCountServantBase, public virtual POA_RtecEventComm::PushConsumer, public TAO_EC_Deactivated_Object { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 9fabba95d48..39b168a4c85 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -106,7 +106,6 @@ private: */ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Base : public POA_RtecEventChannelAdmin::EventChannel - , public PortableServer::RefCountServantBase { public: /// destructor diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index ee870fcb36d..16e5a456e46 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -39,8 +39,7 @@ * of 1.25 (i.e. 5/4), and so on and so forth. */ class TAO_LoadBalancing_Export TAO_LB_CPU_Load_Average_Monitor - : public virtual POA_CosLoadBalancing::LoadMonitor, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::LoadMonitor { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index 71250afcba7..85798d6a44d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -36,8 +36,7 @@ * CPU in the "form" of percentage. */ class TAO_LoadBalancing_Export TAO_LB_CPU_Utilization_Monitor - : public virtual POA_CosLoadBalancing::LoadMonitor, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::LoadMonitor { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 478b6d22b63..df043e104f3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -72,8 +72,7 @@ namespace TAO_LB * member residing at a location with the smallest load. */ class TAO_LB_LeastLoaded - : public virtual POA_CosLoadBalancing::Strategy, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::Strategy { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index 3ba022872e2..d6a4f386926 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -37,8 +37,7 @@ * asynchronously sent exceptions. */ class TAO_LB_LoadAlert_Handler - : public virtual POA_CosLoadBalancing::AMI_LoadAlertHandler, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::AMI_LoadAlertHandler { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index fc69de65e4a..5fbf7360a43 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -54,8 +54,7 @@ namespace TAO_LB * member residing at a location with the smallest load. */ class TAO_LB_LoadAverage - : public virtual POA_CosLoadBalancing::Strategy, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::Strategy { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index 06b190c4e4b..cc9b4ff0bf5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -36,8 +36,7 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager - : public virtual POA_CosLoadBalancing::LoadManager, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::LoadManager { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index 522d574ea3c..7d894bb090a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -72,8 +72,7 @@ namespace TAO_LB * member residing at a location with the smallest load. */ class TAO_LB_LoadMinimum - : public virtual POA_CosLoadBalancing::Strategy, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::Strategy { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index 2f03027c78a..92eb9881ce8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -32,8 +32,7 @@ * member residing at a random location. */ class TAO_LB_Random - : public virtual POA_CosLoadBalancing::Strategy, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::Strategy { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index c244a697157..04f810908d1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -35,8 +35,7 @@ * member residing at the next location. */ class TAO_LB_RoundRobin - : public virtual POA_CosLoadBalancing::Strategy, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::Strategy { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 248bdfb7a5b..558861a0af5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -48,8 +48,7 @@ class TAO_LogMgr_i; */ class TAO_Log_Serv_Export TAO_BasicLog_i : public TAO_Log_i, - public POA_DsLogAdmin::BasicLog, - public virtual PortableServer::RefCountServantBase + public POA_DsLogAdmin::BasicLog { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index 610a24b50ad..fff414f0f16 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -53,8 +53,7 @@ class TAO_EventLogFactory_i; */ class TAO_EventLog_i : public TAO_Log_i, - public POA_DsEventLogAdmin::EventLog, - public virtual PortableServer::RefCountServantBase + public POA_DsEventLogAdmin::EventLog { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index 29d24fd3541..f8e888df87e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -43,7 +43,6 @@ */ class TAO_Log_Serv_Export TAO_Iterator_i : public POA_DsLogAdmin::Iterator, - public virtual PortableServer::RefCountServantBase, public ACE_Event_Handler { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index f4ce4d6a483..7035fc44e3a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -48,8 +48,7 @@ class TAO_NotifyLogFactory_i; * EventChannel. */ class TAO_Notify_LogConsumer : - public virtual POA_CosNotifyComm::PushConsumer, - public PortableServer::RefCountServantBase + public virtual POA_CosNotifyComm::PushConsumer { public: // = Initialization and Termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index 165b255fff2..ce9c7dcfc7e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -44,8 +44,7 @@ */ class TAO_NotifyLog_Serv_Export TAO_NotifyLogNotification : public TAO_LogNotification, - public POA_CosNotifyComm::PushSupplier, - public PortableServer::RefCountServantBase + public POA_CosNotifyComm::PushSupplier { public: // = Initialization and Termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index b083be97a1b..c389f9d7ed0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -50,8 +50,7 @@ class TAO_NotifyLogFactory_i; */ class TAO_NotifyLog_Serv_Export TAO_NotifyLog_i : public TAO_Log_i, - public POA_DsNotifyLogAdmin::NotifyLog, - public virtual PortableServer::RefCountServantBase + public POA_DsNotifyLogAdmin::NotifyLog { public: // = Initialization and Termination. diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index 771f4e203b5..18322e7c436 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -52,8 +52,7 @@ class TAO_RTEventLogFactory_i; */ class TAO_RTEventLog_Export TAO_RTEventLog_i : public TAO_Log_i, - public POA_RTEventLogAdmin::EventLog, - public virtual PortableServer::RefCountServantBase + public POA_RTEventLogAdmin::EventLog { public: // = Initialization and Termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 07bb1612335..8247c6db8d2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -44,8 +44,7 @@ * iterator is destroyed. */ template <class ITERATOR, class TABLE_ENTRY> -class TAO_Bindings_Iterator : public virtual PortableServer::RefCountServantBase, - public virtual POA_CosNaming::BindingIterator +class TAO_Bindings_Iterator : public virtual POA_CosNaming::BindingIterator { public: // = Intialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index d3b4db2c3bd..1c532b8f5d7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -42,7 +42,6 @@ class TAO_Naming_Context_Impl; */ class TAO_Naming_Serv_Export TAO_Naming_Context : - public virtual PortableServer::RefCountServantBase, public virtual POA_CosNaming::NamingContextExt { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 4d6ca6e90e6..a76ebdadfcf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -37,7 +37,8 @@ * @brief Implementation of CosNotifyFilter::Filter servant. * */ -class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase +class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter + : public POA_CosNotifyFilter::Filter { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 38871fe90e7..f0a9f3a1b3d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -35,10 +35,9 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory - : public virtual PortableServer::RefCountServantBase, - public virtual POA_CosNotifyFilter::FilterFactory, - public virtual TAO_Notify_FilterFactory +class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory : + public virtual POA_CosNotifyFilter::FilterFactory, + public virtual TAO_Notify_FilterFactory { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index ff9f3961736..33ee726d0ab 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -486,8 +486,8 @@ public: // ============================================================================ -class TAO_Property_Export TAO_PropertyNamesIterator : public virtual PortableServer::RefCountServantBase, - public virtual POA_CosPropertyService::PropertyNamesIterator +class TAO_Property_Export TAO_PropertyNamesIterator + : public virtual POA_CosPropertyService::PropertyNamesIterator { // = TITLE // The PropertyNamesIterator interface allows a client to @@ -547,8 +547,8 @@ private: // ============================================================================ -class TAO_Property_Export TAO_PropertiesIterator : public virtual PortableServer::RefCountServantBase, - public virtual POA_CosPropertyService::PropertiesIterator +class TAO_Property_Export TAO_PropertiesIterator + : public virtual POA_CosPropertyService::PropertiesIterator { // = TITLE // Thid class implements PropertiesIterator interface allows a client to diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index 07e4aded60b..2c836bf660d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -28,8 +28,7 @@ // ************************************************************* class TAO_Offer_Iterator : - public virtual POA_CosTrading::OfferIterator, - public virtual PortableServer::RefCountServantBase + public virtual POA_CosTrading::OfferIterator { // = TITLE // This class implements CosTrading::OfferIterator IDL @@ -160,8 +159,7 @@ private: // ************************************************************* class TAO_Offer_Iterator_Collection : - public virtual POA_CosTrading::OfferIterator, - public virtual PortableServer::RefCountServantBase + public virtual POA_CosTrading::OfferIterator // = TITLE // A collection of offer iterator to query in turn. // @@ -219,8 +217,7 @@ private: // ************************************************************* class TAO_Offer_Id_Iterator : - public virtual POA_CosTrading::OfferIdIterator, - public virtual PortableServer::RefCountServantBase + public virtual POA_CosTrading::OfferIdIterator // = TITLE // Silly little iterator that contains the overflow of offer ids // from the Admin list_offers method. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index 28c650c495a..be1ec6a4149 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -104,8 +104,7 @@ private: template <class IF> class TAO_Trader_Components : - public virtual IF, - public virtual PortableServer::RefCountServantBase + public virtual IF { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index 5ae13aa7907..5cf6fe357b7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -181,8 +181,7 @@ private: * property handler construct CosTradingDynamic::DynamicProp structs. */ class TAO_Trading_Serv_Export TAO_Dynamic_Property - : public virtual POA_CosTradingDynamic::DynamicPropEval, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosTradingDynamic::DynamicPropEval { public: diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h index 7a6431ca709..6cd4e89a956 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h index 13d5f213cb3..765656037b8 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h @@ -31,8 +31,7 @@ class ServerRequestInterceptor; * request arriving per second. */ class RPS_Monitor - : public virtual POA_CosLoadBalancing::LoadMonitor, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CosLoadBalancing::LoadMonitor { public: diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h index 7a6431ca709..6cd4e89a956 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h index 058dccd1a34..a4b01ce89b1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h @@ -11,7 +11,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h index f23f2c56411..520895f1cab 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h @@ -23,7 +23,6 @@ */ class Callback : public virtual POA_Test::Callback - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h index da5cc753284..65d8f4b6507 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h @@ -11,7 +11,6 @@ /// Implement the Test::Session interface class Session : public virtual POA_Test::Session - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h index 6addb7f27f5..875535d6b93 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h @@ -11,7 +11,6 @@ /// Implement the Test::Session_Factory interface class Session_Factory : public virtual POA_Test::Session_Factory - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h index 9a982381130..f9206fe4ba2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h @@ -26,7 +26,6 @@ */ class TAO_RTEC_Perf_Export Consumer : public virtual POA_RtecEventComm::PushConsumer - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h index f3956b191b4..9b09d063fb0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h @@ -23,7 +23,6 @@ */ class TAO_RTEC_Perf_Export Control : public virtual POA_Federated_Test::Control - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h index 307d3b27e70..384c42cd3cb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h @@ -23,7 +23,6 @@ */ class TAO_RTEC_Perf_Export Loopback : public virtual POA_Federated_Test::Loopback - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index b3e05ea1c10..4ff3203146c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -25,7 +25,6 @@ */ class TAO_RTEC_Perf_Export Loopback_Consumer : public virtual POA_RtecEventComm::PushConsumer - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h index 084c2bd1341..24f2055cf04 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h @@ -25,7 +25,6 @@ */ class TAO_RTEC_Perf_Export Loopback_Supplier : public virtual POA_RtecEventComm::PushSupplier - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h index 3733441998b..948ef5b20a1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h @@ -28,7 +28,6 @@ class RTServer_Setup; */ class TAO_RTEC_Perf_Export Peer_Base : public virtual POA_Federated_Test::Peer - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h index 6a04b5f7049..4ae8d76a414 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h @@ -25,7 +25,6 @@ */ class TAO_RTEC_Perf_Export Supplier : public virtual POA_RtecEventComm::PushSupplier - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index 2e14f1e0a95..0b26ea73695 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -34,7 +34,6 @@ class RND_Driver; class RND_Consumer : public POA_CosEventComm::PushConsumer - , public PortableServer::RefCountServantBase { // = TITLE // Simple consumer object @@ -94,7 +93,6 @@ RND_Timer::RND_Timer (RND_Driver *driver) class RND_Supplier : public POA_CosEventComm::PushSupplier - , public PortableServer::RefCountServantBase , public ACE_Task_Base { // = TITLE diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index bf54ca6d069..a1821d24c0b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -21,16 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class RND_Driver; class RND_Consumer : public POA_RtecEventComm::PushConsumer - , public PortableServer::RefCountServantBase { // = TITLE // Simple consumer object @@ -91,7 +85,6 @@ RND_Timer::RND_Timer (RND_Driver *driver) class RND_Supplier : public POA_RtecEventComm::PushSupplier - , public PortableServer::RefCountServantBase , public ACE_Task_Base { // = TITLE @@ -187,8 +180,4 @@ private: RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_; }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* EC_RANDOM_H */ diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h index a8421c9334e..4ec7bdbb1a4 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h @@ -22,7 +22,6 @@ class TAO_EC_Event_Channel; * - automatic cleanup in destructor, if necessary */ class ECMcastTests_Export EC_Wrapper: - public virtual PortableServer::RefCountServantBase, public virtual POA_RtecEventChannelAdmin::EventChannel, public TAO_EC_Deactivated_Object { diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h index ac59ba89dc2..68311a6634e 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h @@ -16,7 +16,6 @@ /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h index 95f1bbb0128..72a6aeb8977 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h @@ -19,7 +19,6 @@ class LB_Basic_Test; /// Implement the Test::Basic interface class Basic : public virtual POA_Test::Basic - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h index b742f615ab4..7eb93b15f5c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h @@ -14,7 +14,6 @@ /// Implement the Test::Simple interface class Simple : public virtual POA_Test::Simple - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h index 45fbc65d101..ad2bb53be84 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h @@ -17,7 +17,6 @@ /// Implement the Test::Basic interface class Basic : public virtual POA_Test::Basic - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h index 7c3df4e1aa8..0a3d63efa23 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h @@ -19,7 +19,6 @@ class LB_Basic_Test; /// Implement the Test::Simple interface class Simple : public virtual POA_Test::Simple - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h index 54d2aaa265b..73d265944c1 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h @@ -16,7 +16,6 @@ /// Implement the Test::McastHello interface class McastHello : public virtual POA_Test::McastHello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h index 4b2e1021bdb..89b6a17855b 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h @@ -34,7 +34,8 @@ * @brief Implementation of CosNotifyFilter::Filter servant. * */ -class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase +class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_Filter + : public POA_CosNotifyFilter::Filter { public: /// Constuctor diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h index dd0588a2543..16c0bbd0ff7 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h @@ -35,9 +35,9 @@ * @brief * */ -class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_FilterFactory : public virtual PortableServer::RefCountServantBase - , public virtual POA_CosNotifyFilter::FilterFactory - , public virtual TAO_Notify_FilterFactory +class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_FilterFactory + : public virtual POA_CosNotifyFilter::FilterFactory + , public virtual TAO_Notify_FilterFactory { public: /// Constuctor diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h index 1d47655f069..0356c52d844 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h @@ -27,7 +27,7 @@ * */ template <class Peer_Traits> -class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits::SKELETON, public PortableServer::RefCountServantBase +class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits::SKELETON { typedef ACE_TYPENAME Peer_Traits::Admin_Traits Admin_Traits; typedef ACE_TYPENAME Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index a6d83524294..f48b999aac6 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -160,7 +160,8 @@ class RedGreen_Test }; /*****************************************************************/ -class RedGreen_Test_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase +class RedGreen_Test_StructuredPushConsumer + : public POA_CosNotifyComm::StructuredPushConsumer { // = TITLE // RedGreen_Test_StructuredPushConsumer @@ -257,8 +258,7 @@ public: /*****************************************************************/ class RedGreen_Test_StructuredPushSupplier - : public POA_CosNotifyComm::StructuredPushSupplier, - public PortableServer::RefCountServantBase + : public POA_CosNotifyComm::StructuredPushSupplier { // = TITLE // RedGreen_Test_StructuredPushSupplier diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h index c13c2fc78f4..ffddfb90fa9 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h +++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h @@ -25,8 +25,7 @@ * @brief This class is used to test the RTCORBA 1.0 Scheduling Service * */ -class Object1_impl : public POA_testSched::Object1, - public PortableServer::RefCountServantBase +class Object1_impl : public POA_testSched::Object1 { public: Object1_impl(); diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h index 117617125e0..e5d6603aca9 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client_i.h +++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h @@ -23,8 +23,7 @@ #include "serverC.h" class client_i - : public virtual POA_client, - public virtual PortableServer::RefCountServantBase + : public virtual POA_client { public: diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h index 628782bedd3..443bd091a04 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.h +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h @@ -23,8 +23,7 @@ class server_i - : public virtual POA_server, - public virtual PortableServer::RefCountServantBase + : public virtual POA_server { public: diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 144006f317e..c6acd255e3e 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h @@ -19,7 +19,6 @@ #include "orbsvcs/SecurityLevel3C.h" class Foo_i : public virtual POA_Foo::Bar - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h index 3851a2748d6..c5030340c1d 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::AMI_Buffering interface class AMI_Buffering : public virtual POA_Test::AMI_Buffering - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -45,9 +39,5 @@ private: Test::AMI_Buffering_Admin_var admin_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* AMI_BUFFERING_H */ diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h index e8a3cdb00db..904b4253ec5 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::AMI_Buffering_Admin interface class AMI_Buffering_Admin : public virtual POA_Test::AMI_Buffering_Admin - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -50,9 +44,5 @@ private: CORBA::ULong bytes_received_count_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* AMI_BUFFERING_H */ diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h index be2afed0986..f36e5734f41 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.h +++ b/TAO/tests/AMI_Buffering/Reply_Handler.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the AMI_AMI_BufferingHandler interface class Reply_Handler : public virtual POA_Test::AMI_AMI_BufferingHandler - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -42,9 +36,5 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* REPLY_HANDLER_H */ diff --git a/TAO/tests/Any/Recursive/Hello.h b/TAO/tests/Any/Recursive/Hello.h index 0bff33b9322..948d883b625 100644 --- a/TAO/tests/Any/Recursive/Hello.h +++ b/TAO/tests/Any/Recursive/Hello.h @@ -18,14 +18,8 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: @@ -47,8 +41,4 @@ private: }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* HELLO_H */ diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h index 47f5f0c57bf..08795309e7a 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h @@ -18,8 +18,7 @@ #include "testS.h" -class Callback_i : public virtual POA_Callback, - public virtual PortableServer::RefCountServantBase +class Callback_i : public virtual POA_Callback { // = TITLE // A callback object to the "client" @@ -45,8 +44,7 @@ private: // The orb }; -class Simple_Server_i : public virtual POA_Simple_Server, - public virtual PortableServer::RefCountServantBase +class Simple_Server_i : public virtual POA_Simple_Server { // = TITLE // Simpler Server implementation diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index b374bea1360..8e580b23939 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -15,11 +15,6 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Big_Reply interface /** * Simply return a Big_Reply @@ -27,7 +22,6 @@ class Big_Reply_i : public virtual POA_Test::Big_Reply - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -59,10 +53,6 @@ private: }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /*TAO_TESTS_BIG_REPLY_I_H*/ diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h index cc32a3c1f92..4958c3e5d38 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h @@ -8,18 +8,12 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Payload_Receiver interface /** * Simply print count how many bytes were received. */ class Payload_Receiver : public virtual POA_Test::Payload_Receiver - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -40,9 +34,5 @@ private: CORBA::ULong byte_count_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* BIG_REQUEST_MUXING_PAYLOAD_RECEIVER_H */ diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h index 423c57414b2..2a142889512 100644 --- a/TAO/tests/Big_Twoways/Peer.h +++ b/TAO/tests/Big_Twoways/Peer.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Peer interface class Peer : public virtual POA_Test::Peer - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -41,9 +35,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* BIG_ONEWAYS_PEER_H */ diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h index 399c43a9bce..65a0714374f 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Blocking_Sync_None interface class Blocking_Sync_None : public virtual POA_Test::Blocking_Sync_None - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -36,9 +30,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* BLOCKING_SYNC_NONE_H */ diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h index f698fe5e4eb..387a467f8fd 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.h +++ b/TAO/tests/Bug_1476_Regression/Sender_i.h @@ -15,11 +15,6 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Sender interface /** * Implements the oneway call send_ready_message. This in turn calls @@ -28,7 +23,6 @@ class Sender_i : public virtual POA_Test::Sender - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -60,9 +54,5 @@ private: CORBA::ULong number_received_; }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /*TAO_TESTS_ONEWAYS_INVOKING_TWOWAYS_SENDER_I_H*/ diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h index b4c057f18aa..58a5fd909b3 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.h +++ b/TAO/tests/Bug_1482_Regression/Hello.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -38,9 +32,5 @@ private: CORBA::ULong latest_prime_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h index ed43b1e5d79..db21e2a6abb 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.h +++ b/TAO/tests/Bug_1495_Regression/test_i.h @@ -37,7 +37,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class Bug1495_i : public virtual POA_Bug1495_Regression::Bug1495, public virtual PortableServer::RefCountServantBase +class Bug1495_i : public virtual POA_Bug1495_Regression::Bug1495 { public: //Constructor diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h index 5a201a415a1..156365e9b6b 100644 --- a/TAO/tests/Bug_1551_Regression/Hello.h +++ b/TAO/tests/Bug_1551_Regression/Hello.h @@ -9,14 +9,8 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -33,9 +27,5 @@ private: ACE_Atomic_Op<TAO_SYNCH_MUTEX,long> atomic_counter_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h index 6da1dcea8e5..aaadd0582f0 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h @@ -11,7 +11,6 @@ class Reply_Handler : public POA_Test::AMI_HelloHandler - , public PortableServer::RefCountServantBase { public: Reply_Handler ( diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h index ac59ba89dc2..1a404058944 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.h +++ b/TAO/tests/Cache_Growth_Test/Hello.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -35,9 +29,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h index f7c8a86ffbb..4118fc33d58 100644 --- a/TAO/tests/Client_Leaks/Process.h +++ b/TAO/tests/Client_Leaks/Process.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Process interface class Process : public virtual POA_Test::Process - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -35,9 +29,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* CLIENT_LEAKS_PROCESS_H */ diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h index 9ad8b41e4e6..0836a583d84 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.h +++ b/TAO/tests/Client_Leaks/Process_Factory.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Process_Factory interface class Process_Factory : public virtual POA_Test::Process_Factory - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -44,9 +38,5 @@ private: int shutdown_received_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* CLIENT_LEAKS_PROCESS_FACTORY_H */ diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h index e8c66c70768..34e3d8e7412 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.h +++ b/TAO/tests/Client_Leaks/Startup_Callback.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Startup_Callback interface class Startup_Callback : public virtual POA_Test::Startup_Callback - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -42,9 +36,5 @@ private: Test::Process_var process_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* CLIENT_LEAKS_STARTUP_CALLBACK_H */ diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h index b5437057846..ba9e6637812 100644 --- a/TAO/tests/Collocation_Tests/Hello.h +++ b/TAO/tests/Collocation_Tests/Hello.h @@ -8,17 +8,11 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - #include "ace/OS.h" /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -40,9 +34,5 @@ private: ACE_thread_t thr_id_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h index ac59ba89dc2..1a404058944 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.h +++ b/TAO/tests/Connect_Strategy_Test/Hello.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -35,9 +29,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h index ba4d2279cf0..2670a7a51d8 100644 --- a/TAO/tests/Connection_Purging/test_i.h +++ b/TAO/tests/Connection_Purging/test_i.h @@ -8,15 +8,8 @@ #include "testS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - - class test_i : public virtual POA_test - , public virtual PortableServer::RefCountServantBase { public: // = The skeleton methods @@ -27,9 +20,5 @@ public: private: }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* TEST_I_H */ diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h index c3bc225ebd9..fae5e073bae 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Oneway_Receiver interface class Oneway_Receiver : public virtual POA_Test::Oneway_Receiver - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -27,9 +21,5 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* ONEWAY_RECEIVER_H */ diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h index c99b6d8d04f..5a0614f1b74 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.h +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Crashed_Callback interface class Crashed_Callback : public virtual POA_Test::Crashed_Callback - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -33,9 +27,5 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* CRASHED_CALLBACK_CRASHED_CALLBACK_H */ diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h index cf8d3f72fb5..6f4de205f13 100644 --- a/TAO/tests/Crashed_Callback/Service.h +++ b/TAO/tests/Crashed_Callback/Service.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Service interface class Service : public virtual POA_Test::Service - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -55,9 +49,5 @@ private: int test_count_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* CRASHED_CALLBACK_SERVICE_H */ diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h index 625c9a9d858..d9a8dbab725 100644 --- a/TAO/tests/Faults/ping_i.h +++ b/TAO/tests/Faults/ping_i.h @@ -18,8 +18,7 @@ #include "pingS.h" -class PingObject_i : public POA_PingObject, - public virtual PortableServer::RefCountServantBase +class PingObject_i : public POA_PingObject { // = TITLE // A simple implementation of the <ping> interface diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h index 9b710191c08..a1eddc9e280 100644 --- a/TAO/tests/Faults/test_i.h +++ b/TAO/tests/Faults/test_i.h @@ -19,8 +19,7 @@ #include "testS.h" class Callback_i - : public virtual POA_Callback, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Callback { // = TITLE // A callback object to shutdown the "client" diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h index 4f8f16ed758..418f80cbffa 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h @@ -8,18 +8,12 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Payload_Receiver interface /** * Simply print count how many bytes were received. */ class Payload_Receiver : public virtual POA_Test::Payload_Receiver - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -41,9 +35,5 @@ public: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* JAVA_BIG_REQUEST_PAYLOAD_RECEIVER_H */ diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h index 88afa939238..b9ced6d7672 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h @@ -8,18 +8,12 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Payload_Receiver interface /** * Simply print count how many bytes were received. */ class Payload_Receiver : public virtual POA_Test::Payload_Receiver - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -41,9 +35,5 @@ public: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* PMB_WITH_FRAGMENTS_PAYLOAD_RECEIVER_H */ diff --git a/TAO/tests/Hang_Shutdown/test_i.h b/TAO/tests/Hang_Shutdown/test_i.h index f6ae2244223..1368f3c36c8 100644 --- a/TAO/tests/Hang_Shutdown/test_i.h +++ b/TAO/tests/Hang_Shutdown/test_i.h @@ -7,11 +7,6 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - #include "ace/OS_NS_unistd.h" namespace TAO @@ -20,7 +15,6 @@ namespace TAO { class test_i : public virtual POA_TAO::Test::Hang - , public virtual PortableServer::RefCountServantBase { public: // = The skeleton methods @@ -46,9 +40,6 @@ namespace TAO }; } } -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ #include /**/ "ace/post.h" #endif /* TAO_HANG_TEST_I_H */ diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h index ac59ba89dc2..1a404058944 100644 --- a/TAO/tests/Hello/Hello.h +++ b/TAO/tests/Hello/Hello.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -35,9 +29,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h index e4fae38b6bf..429a7e10963 100755 --- a/TAO/tests/ICMG_Any_Bug/Hello.h +++ b/TAO/tests/ICMG_Any_Bug/Hello.h @@ -9,16 +9,10 @@ #include "tao/ORB.h" #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Hello interface /// class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: @@ -38,9 +32,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h index 35b13b307a5..ad60160af2d 100755 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h @@ -8,16 +8,10 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::HelloWorld interface /// class HelloWorld : public virtual POA_Test::HelloWorld - , public virtual PortableServer::RefCountServantBase { public: @@ -29,9 +23,5 @@ public: }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLOWORLD_H */ diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h index 8eee416cee1..94a4961f8ff 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h +++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h @@ -8,14 +8,8 @@ #include "bogusS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - class bogus : public virtual POA_Test::bogus - , public virtual PortableServer::RefCountServantBase { public: bogus (); @@ -25,9 +19,5 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif //bogus_h diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index 7166507b05c..9e1d360e5e8 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -6,14 +6,8 @@ #include "TestS.h" #include "ace/Task.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable : 4250) -#endif /* _MSC_VER */ - class AMI_Manager - : public virtual POA_Test::Manager, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Test::Manager { public: AMI_Manager (CORBA::ORB_ptr orb); @@ -61,7 +55,6 @@ private: class Controller_Handler : public virtual POA_Test::AMI_ControllerHandler - , public virtual PortableServer::RefCountServantBase { public: Controller_Handler (TAO_SYNCH_MUTEX *mutex, @@ -87,8 +80,4 @@ private: // The mutex is used to protect the access to the flag. }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* LONGUPCALLS_AMI_MANAGER_H */ diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h index b1a86c977eb..a3992eb5c59 100644 --- a/TAO/tests/LongUpcalls/Controller.h +++ b/TAO/tests/LongUpcalls/Controller.h @@ -5,14 +5,8 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - class Controller - : public virtual POA_Test::Controller, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Test::Controller { public: Controller (void); @@ -33,8 +27,4 @@ private: CORBA::ULong finish_count_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* LONGUPCALLS_CONTROLLER_H */ diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index 2a075460e3d..65e7934f00c 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -8,14 +8,8 @@ #include "TestS.h" #include "ace/Task.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable : 4250) -#endif /* _MSC_VER */ - class Manager : public virtual POA_Test::Manager - , public virtual PortableServer::RefCountServantBase { public: Manager (CORBA::ORB_ptr orb); @@ -55,8 +49,4 @@ private: // The number of milliseconds. }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* LONGUPCALLS_MANAGER_H */ diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h index 2ad954a1a56..742f4c76ca3 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.h +++ b/TAO/tests/LongUpcalls/Manager_Handler.h @@ -8,14 +8,8 @@ #include "TestS.h" #include "ace/Task.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable : 4250) -#endif /* _MSC_VER */ - class Manager_Handler : public virtual POA_Test::AMI_ManagerHandler - , public virtual PortableServer::RefCountServantBase { public: Manager_Handler (Test::Manager_ptr manager, @@ -38,8 +32,4 @@ private: // The controller }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* LONGUPCALLS_MANAGER_HANDLER_H */ diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h index 1bdd768901d..189191d7861 100644 --- a/TAO/tests/MT_BiDir/Receiver_i.h +++ b/TAO/tests/MT_BiDir/Receiver_i.h @@ -8,17 +8,11 @@ #include "ReceiverS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /** * Simply print count how many bytes were received. */ class Receiver_i : public virtual POA_Receiver - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -39,9 +33,5 @@ private: CORBA::ULong byte_count_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* MUXING_RECEIVER_H */ diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h index 8b9c159b190..cda5d4bf54e 100644 --- a/TAO/tests/MT_BiDir/Sender_i.h +++ b/TAO/tests/MT_BiDir/Sender_i.h @@ -8,11 +8,6 @@ #include "SenderS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - class ACE_Manual_Event; /** @@ -20,7 +15,6 @@ class ACE_Manual_Event; */ class Sender_i : public virtual POA_Sender - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -56,9 +50,5 @@ private: Receiver::Payload payload_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* MUXING_RECEIVER_H */ diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h index b643abccbbb..bc1c17e9210 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.h +++ b/TAO/tests/MT_Timeout/Sleep_Service.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Sleep_Service interface class Sleep_Service : public virtual POA_Test::Sleep_Service - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -36,9 +30,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* SLEEP_SERVICE_H */ diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h index 225e117cedf..bd913ce1782 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h @@ -13,7 +13,6 @@ class Client_Peer : public POA_Test::Peer - , public PortableServer::RefCountServantBase { public: Client_Peer (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h index 0d168952a24..c1ee59f802f 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h @@ -13,7 +13,6 @@ class Server_Peer : public POA_Test::Peer - , public PortableServer::RefCountServantBase { public: Server_Peer (ACE_RANDR_TYPE seed, diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index 60df8444925..9d0932b1d87 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -9,43 +9,43 @@ /** * \class node_impl * - * + * */ class node_impl : public virtual OBV_Supports_Test::Node, public virtual CORBA::DefaultValueRefCountBase { - + public: node_impl (void); - + node_impl (const char * name); - + virtual void add_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void remove_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + void change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + void print (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + }; class node_init_impl : public Supports_Test::Node_init { - + public: - + virtual Supports_Test::Node * create (void) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::ValueBase * create_for_unmarshal (void); - + }; @@ -54,84 +54,83 @@ class vt_graph_impl : public virtual POA_Supports_Test::vt_graph, public virtual CORBA::DefaultValueRefCountBase { - + public: - + vt_graph_impl (void); - + vt_graph_impl (int num_nodes ACE_ENV_ARG_DECL); - + virtual CORBA::Long size (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void add_node (const char * name ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void print (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + }; class vt_graph_init_impl : public Supports_Test::vt_graph_init { - + public: - + virtual Supports_Test::vt_graph * create (void) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::ValueBase * create_for_unmarshal (void); - + }; class test_impl : - public virtual POA_Supports_Test::test, - public virtual PortableServer::RefCountServantBase + public virtual POA_Supports_Test::test { - + public: - + test_impl (CORBA::ORB_ptr orb); - + virtual ~test_impl (void); - + virtual void pass_obj_graph_in (Supports_Test::graph * graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void finish (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + private: - + CORBA::ORB_var orb_; - + }; #endif /* TAO_SUPPORTS_TEST_IMPL_H */ diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.h b/TAO/tests/ORB_shutdown/Foo_Bar.h index 5a6037f5e4c..36a17fc941d 100644 --- a/TAO/tests/ORB_shutdown/Foo_Bar.h +++ b/TAO/tests/ORB_shutdown/Foo_Bar.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Hello interface class Foo_Bar : public virtual POA_Test::Foo - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -32,9 +26,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h index 72784ad6f93..5fc58fc95cd 100644 --- a/TAO/tests/Object_Loader/Test_i.h +++ b/TAO/tests/Object_Loader/Test_i.h @@ -19,12 +19,7 @@ #include "TestS.h" #include "OLT_Export.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -class OLT_Export Test_i : public POA_Test, public PortableServer::RefCountServantBase +class OLT_Export Test_i : public POA_Test { // = TITLE // Implement the Test interface @@ -51,8 +46,4 @@ private: static CORBA::Long instance_count_; }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #endif /* TAO_OBJECT_LOADER_TEST_I_H */ diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h index 229ae6f51d9..c1cc0c5144b 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Oneway_Buffering interface class Oneway_Buffering : public virtual POA_Test::Oneway_Buffering - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -45,9 +39,5 @@ private: Test::Oneway_Buffering_Admin_var admin_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* ONEWAY_BUFFERING_H */ diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h index 5c9145daf4c..bf1a4dbbdde 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Oneway_Buffering_Admin interface class Oneway_Buffering_Admin : public virtual POA_Test::Oneway_Buffering_Admin - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -50,9 +44,5 @@ private: CORBA::ULong bytes_received_count_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* ONEWAY_BUFFERING_H */ diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index 9649347aec3..a5f13e29217 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -15,11 +15,6 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Receiver interface /** * Skeleton implementation.. @@ -27,7 +22,6 @@ class Receiver_i : public virtual POA_Test::Receiver - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -60,9 +54,5 @@ private: CORBA::ULong no_calls_; }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /*TAO_TESTS_ONEWAYS_INVOKING_TWOWAYS_RECEIVER_I_H*/ diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 661fdf27814..1d372a6707a 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -15,11 +15,6 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Sender interface /** * Implements the oneway call send_ready_message. This in turn calls @@ -28,7 +23,6 @@ class Sender_i : public virtual POA_Test::Sender - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -61,9 +55,5 @@ private: CORBA::Short active_objects_; }; -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /*TAO_TESTS_ONEWAYS_INVOKING_TWOWAYS_SENDER_I_H*/ diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h index 2b9bc7c3e63..8ee25ebc312 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.h +++ b/TAO/tests/POA/Deactivate_Object/Hello.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -32,9 +26,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h index d858a5603b9..de20793bbde 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h @@ -13,7 +13,6 @@ class Echo : public POA_Test::Echo - , public PortableServer::RefCountServantBase { public: Echo(CORBA::ORB_ptr orb); diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h index 156908881f9..8ecb15d64f1 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h @@ -13,7 +13,6 @@ class Echo_Handler : public POA_Test::AMI_EchoHandler - , public PortableServer::RefCountServantBase { public: Echo_Handler(void); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h index aed3c6f4ba9..f31756fb10a 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h @@ -18,8 +18,7 @@ #include "testS.h" -class Visual_i : public POA_Test_Interceptors::Visual, - public virtual PortableServer::RefCountServantBase +class Visual_i : public POA_Test_Interceptors::Visual { // = DESCRIPTION // Implements the Visual interface in test.idl diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h index 45503887da7..76a767d6a6a 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h @@ -19,8 +19,7 @@ * * Implements the Visual interface in test.idl */ -class Visual_i : public virtual POA_Test_Interceptors::Visual, - public virtual PortableServer::RefCountServantBase +class Visual_i : public virtual POA_Test_Interceptors::Visual { public: diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h index 5f5d29c15d1..634167f5f35 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h @@ -12,8 +12,7 @@ #include "tao/RTCORBA/RTCORBA.h" class test_i : - public POA_test, - public PortableServer::RefCountServantBase + public POA_test { public: /// Constructor. diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h index d3c8bf5af4e..14234e78d65 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h @@ -11,8 +11,7 @@ #include "testS.h" class test_i : - public POA_test, - public PortableServer::RefCountServantBase + public POA_test { public: /// Constructor. diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h index 26e93bd8e31..fdf0a36b9c5 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Oneway_Receiver interface class Oneway_Receiver : public virtual POA_Test::Oneway_Receiver - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -38,9 +32,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* ONEWAY_RECEIVER_H */ diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h index f70ce4239f6..e4b764f3497 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Shutdown_Helper interface class Shutdown_Helper : public virtual POA_Test::Shutdown_Helper - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -32,9 +26,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* SHUTDOWN_HELPER_H */ diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h index 6cf7de34f78..4ff3dd09b6e 100644 --- a/TAO/tests/Servant_To_Reference_Test/Test_i.h +++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h @@ -8,14 +8,8 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - class One_Impl : public virtual POA_Test::One - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -33,7 +27,6 @@ private: class Two_Impl : public virtual POA_Test::Two - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -51,7 +44,6 @@ private: class Three_Impl : public virtual POA_Test::Three - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -67,9 +59,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h index 2d192ebdc71..0f6e923322d 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.h +++ b/TAO/tests/Server_Connection_Purging/Test_i.h @@ -8,15 +8,8 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - - class test_i : public virtual POA_test - , public virtual PortableServer::RefCountServantBase { public: // = The skeleton methods @@ -27,9 +20,5 @@ public: private: }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* TEST_I_H */ diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h index 7b763e3c2ba..8136914b8ce 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.h +++ b/TAO/tests/Server_Leaks/Ping_Service.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Ping_Service interface class Ping_Service : public virtual POA_Test::Ping_Service - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -35,9 +29,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* SERVER_LEAKS_PING_SERVICE_H */ diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h index ac59ba89dc2..1a404058944 100644 --- a/TAO/tests/Server_Port_Zero/Hello.h +++ b/TAO/tests/Server_Port_Zero/Hello.h @@ -8,15 +8,9 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -35,9 +29,5 @@ private: CORBA::ORB_var orb_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h index f3fe91b9a7c..79992a522d5 100644 --- a/TAO/tests/Stack_Recursion/Sender.h +++ b/TAO/tests/Stack_Recursion/Sender.h @@ -8,18 +8,12 @@ #include "TestS.h" -#if defined (_MSC_VER) -# pragma warning(push) -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - /// Implement the Test::Receiver interface /** * Simply print count how many bytes were received. */ class Sender : public virtual POA_Test::Sender - , public virtual PortableServer::RefCountServantBase { public: /// Constructor @@ -55,9 +49,5 @@ private: int is_done_; }; -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - #include /**/ "ace/post.h" #endif /* MUXING_RECEIVER_H */ |