diff options
39 files changed, 227 insertions, 240 deletions
diff --git a/TAO/CIAO/CIDLC/Literals.cpp b/TAO/CIAO/CIDLC/Literals.cpp index dddf7029294..af9a3d5e809 100644 --- a/TAO/CIAO/CIDLC/Literals.cpp +++ b/TAO/CIAO/CIDLC/Literals.cpp @@ -68,9 +68,6 @@ namespace StringLiterals // This could change - don't want it scattered all over. "namespace CIDL_", // CIDL_NS - // Commonly used base class. - "public virtual PortableServer::RefCountServantBase", // INH_RCSB - // Labels for things stored in a SyntaxTree node's Context. "CIDLC::RepositoryIdGenerator::TypeId", // TYPE_ID "CIDLC::RepositoryIdGenerator::TypePrefix", // TYPE_PREFIX diff --git a/TAO/CIAO/CIDLC/Literals.hpp b/TAO/CIAO/CIDLC/Literals.hpp index c770a10a8c1..84f70e1a4c2 100644 --- a/TAO/CIAO/CIDLC/Literals.hpp +++ b/TAO/CIAO/CIDLC/Literals.hpp @@ -42,7 +42,6 @@ namespace StringLiterals COMP_SC, COMP_CD, CIDL_NS, - INH_RCSB, TYPE_ID, TYPE_PREFIX, REPO_ID, diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp index f5a0aede961..2db62d3c8ea 100644 --- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp +++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp @@ -248,7 +248,7 @@ namespace private: std::ostream& os; }; - + // Generates the set operation of a ReadWriteAttribute. struct WriteAttributeEmitter : Traversal::ReadWriteAttribute, EmitterBase @@ -259,52 +259,52 @@ namespace type_name_emitter_ (c.os ()) { write_belongs_.node_traverser (write_type_name_emitter_); - - edge_traverser (set_raises_); + + edge_traverser (set_raises_); set_raises_.node_traverser (type_name_emitter_); } - + virtual void pre (SemanticGraph::ReadWriteAttribute&) { os << "virtual void" << endl; } - + virtual void name (SemanticGraph::ReadWriteAttribute& a) { os << a.name () << " (" << endl; - + Traversal::ReadWriteAttribute::belongs (a, write_belongs_); - + os << " " << a.name () << endl << STRS[ENV_HDR] << ")" << endl; } - + virtual void get_raises (SemanticGraph::ReadWriteAttribute&) { } - + virtual void set_raises_none (SemanticGraph::ReadWriteAttribute&) { os << STRS[EXCP_SNGL]; } - + virtual void set_raises_pre (SemanticGraph::ReadWriteAttribute&) { os << STRS[EXCP_START] << endl << STRS[EXCP_SYS] << "," << endl; } - + virtual void set_raises_post (SemanticGraph::ReadWriteAttribute&) { os << "))"; } - + virtual void post (SemanticGraph::ReadWriteAttribute&) { @@ -316,7 +316,7 @@ namespace { os << "," << endl; } - + private: INArgTypeNameEmitter write_type_name_emitter_; TypeNameEmitter type_name_emitter_; @@ -335,11 +335,11 @@ namespace type_name_emitter_ (c.os ()) { read_belongs_.node_traverser (read_type_name_emitter_); - - edge_traverser (get_raises_); + + edge_traverser (get_raises_); get_raises_.node_traverser (type_name_emitter_); } - + // ReadWriteAttribute // virtual void @@ -348,36 +348,36 @@ namespace os << "virtual "; Traversal::ReadWriteAttribute::belongs (a, read_belongs_); - + os << endl; } - + virtual void name (SemanticGraph::ReadWriteAttribute& a) { os << a.name () << " (" << endl << STRS[ENV_SNGL_HDR] << ")" << endl; } - + virtual void get_raises_none (SemanticGraph::ReadWriteAttribute&) { os << STRS[EXCP_SNGL]; } - + virtual void get_raises_pre (SemanticGraph::ReadWriteAttribute&) { os << STRS[EXCP_START] << endl << STRS[EXCP_SYS] << "," << endl; } - + virtual void get_raises_post (SemanticGraph::ReadWriteAttribute&) { os << "))"; } - + virtual void set_raises (SemanticGraph::ReadWriteAttribute&) { @@ -387,7 +387,7 @@ namespace post (SemanticGraph::ReadWriteAttribute& a) { os << ";" << endl << endl; - + WriteAttributeEmitter write_attribute_emitter (ctx); write_attribute_emitter.traverse (a); } @@ -397,7 +397,7 @@ namespace { os << "," << endl; } - + // ReadAttribute // virtual void @@ -406,36 +406,36 @@ namespace os << "virtual "; Traversal::ReadAttribute::belongs (a, read_belongs_); - + os << endl; } - + virtual void name (SemanticGraph::ReadAttribute& a) { os << a.name () << " (" << endl << STRS[ENV_SNGL_HDR] << ")" << endl; } - + virtual void get_raises_none (SemanticGraph::ReadAttribute&) { os << STRS[EXCP_SNGL]; } - + virtual void get_raises_pre (SemanticGraph::ReadAttribute&) { os << STRS[EXCP_START] << endl << STRS[EXCP_SYS] << "," << endl; } - + virtual void get_raises_post (SemanticGraph::ReadAttribute&) { os << "))"; } - + virtual void set_raises (SemanticGraph::ReadAttribute&) { @@ -452,7 +452,7 @@ namespace { os << "," << endl; } - + private: ReturnTypeNameEmitter read_type_name_emitter_; TypeNameEmitter type_name_emitter_; @@ -501,11 +501,10 @@ namespace ScopedName scoped (i.scoped_name ()); Name stripped (scoped.begin () + 1, scoped.end ()); - + os << "template <typename T>" << endl << "class " << i.name () << "_Servant_T" << endl - << ": public virtual POA_" << stripped << "," << endl - << STRS[INH_RCSB] << endl + << ": public virtual POA_" << stripped << endl << "{" << "public:" << endl << i.name () << "_Servant_T (" << endl @@ -776,7 +775,7 @@ namespace << STRS[EXCP_START] << endl << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "));" << endl << endl; - + os << "// CIAO-specific." << endl << STRS[COMP_CK] << " *" << endl << "subscribe_" << p.name () << "_generic (" << endl @@ -785,7 +784,7 @@ namespace << STRS[EXCP_START] << endl << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "));" << endl << endl; - + os << "virtual "; Traversal::PublisherData::belongs (p, belongs_); @@ -860,7 +859,7 @@ namespace os << "Consumer_var>" << endl << "ciao_publishes_" << p.name () << "_map_;" << endl << endl; - + os << "ACE_Active_Map_Manager<" << endl << STRS[COMP_ECB] << "_var>" << endl << "ciao_publishes_" << p.name () << "_generic_map_;" @@ -901,12 +900,12 @@ namespace component_emitter.traverse (t); } - + os << "class " << t.name () << "_Servant;" << endl; string swap_option = cl_.get_value ("custom-container", ""); bool swapping = (swap_option == "upgradeable"); - + os << "class " << ctx.export_macro () << " " << t.name () << "_Context" << endl << " : public virtual CIAO::" @@ -982,7 +981,7 @@ namespace << "::CCM_" << t.name () << "_Context" << endl << "// that enable component swapping in the container" << endl << endl; - + os << "virtual " << STRS[COMP_CD] << " *" << endl << "get_registered_consumers (" << endl << "const char *publisher_name" << endl @@ -1048,7 +1047,7 @@ namespace // Namespace closer. // os << "}"; } - + private: CommandLine const& cl_; }; @@ -1177,8 +1176,7 @@ namespace Traversal::ConsumerData::belongs (c, stripped_belongs_); - os << "Consumer," << endl - << STRS[INH_RCSB] << endl + os << "Consumer" << endl << "{" << "public:" << endl; @@ -1222,13 +1220,13 @@ namespace << STRS[EXCP_START] << endl << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_BET] << "));" << endl << endl; - + os << "// CIAO-specific in " << STRS[COMP_ECB] << "." << endl << "virtual CORBA::Boolean" << endl << "ciao_is_substitutable (" << endl << "const char *event_repo_id" << endl << STRS[ENV_HDR] << ")" << endl - << STRS[EXCP_SNGL] << ";" << endl << endl; + << STRS[EXCP_SNGL] << ";" << endl << endl; os << "// Get component implementation." << endl << "virtual CORBA::Object_ptr" << endl @@ -1459,7 +1457,7 @@ namespace << t.name () << "_var," << endl << " " << t.name () << "_Context" << endl << " > comp_svnt_base;" << endl << endl; - + os << t.name () << "_Servant (" << endl << t.scoped_name ().scope_name () << "::CCM_" << t.name () << "_ptr executor," << endl @@ -1664,7 +1662,7 @@ namespace component_emitter.traverse (t); } - + os << "const char *ins_name_;" << endl << endl; os << "private:" << endl << endl @@ -1917,10 +1915,10 @@ namespace os << "class " << ctx.export_macro () << " " << t.name () << "_Servant" << endl << " : public virtual CIAO::"; - + string swap_option = cl_.get_value ("custom-container", ""); bool swapping = (swap_option == "upgradeable"); - + ScopedName scoped (t.scoped_name ()); Name stripped (scoped.begin () + 1, scoped.end ()); @@ -1931,35 +1929,35 @@ namespace << " " << t.scoped_name ().scope_name () << "::CCM_" << t.name () << "_var," << endl << " "; - + Traversal::Home::manages (t, manages_); os << "," << endl << " "; - + Traversal::Home::manages (t, manages_); os << "_var," << endl << " "; - + Traversal::Home::manages (t, enclosing_manages_); os << "::CCM_"; - + Traversal::Home::manages (t, simple_manages_); os << "," << endl << " "; - + Traversal::Home::manages (t, enclosing_manages_); os << "::CCM_"; - + Traversal::Home::manages (t, simple_manages_); os << "_var," << endl << " "; - + Traversal::Home::manages (t, simple_manages_); os << "_Servant" << endl @@ -1975,35 +1973,35 @@ namespace << " " << t.scoped_name ().scope_name () << "::CCM_" << t.name () << "_var," << endl << " "; - + Traversal::Home::manages (t, manages_); os << "," << endl << " "; - + Traversal::Home::manages (t, manages_); os << "_var," << endl << " "; - + Traversal::Home::manages (t, enclosing_manages_); os << "::CCM_"; - + Traversal::Home::manages (t, simple_manages_); os << "," << endl << " "; - + Traversal::Home::manages (t, enclosing_manages_); os << "::CCM_"; - + Traversal::Home::manages (t, simple_manages_); os << "_var," << endl << " "; - + Traversal::Home::manages (t, simple_manages_); os << "_Servant" << endl @@ -2364,7 +2362,7 @@ ServantHeaderEmitter::pre (TranslationUnit&) string swap_option = cl_.get_value ("custom-container", ""); bool swapping = (swap_option == "upgradeable"); - + os << "#include \"ciao/" << (swapping ? "Swapping_Container.h" : "Container_Base.h") << "\"" << endl @@ -2374,7 +2372,7 @@ ServantHeaderEmitter::pre (TranslationUnit&) << "\"" << endl << "#include \"ciao/Servant_Impl_T.h\"" << endl << "#include \"ciao/" - << (swapping ? "Swapping_Servant_Home_Impl_T.h" + << (swapping ? "Swapping_Servant_Home_Impl_T.h" : "Home_Servant_Impl_T.h") << "\"" << endl << "#include \"ace/Active_Map_Manager_T.h\"" << endl << endl; diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index a51b292ca3e..6cb6fc74b51 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,6 +1,49 @@ +Mon Jul 4 09:15:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * CIDLC/Literals.cpp: + * CIDLC/Literals.h:pp: + * CIDLC/ServantHeaderGenerator.cpp: + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: + * DAnCE/ExecutionManager/ExecutionManager_Impl.h: + * DAnCE/ExecutionManager/Execution_Manager_Impl.h: + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: + * DAnCE/NodeManager/NodeDaemon_Impl.h: + * DAnCE/RepositoryManager/RepositoryManager_Impl.h: + * DAnCE/ciao/Container_Impl.h: + * DAnCE/ciao/Home_Servant_Impl_T.h: + * DAnCE/ciao/NodeApp_CB_Impl.h: + * DAnCE/ciao/NodeApplication_Impl.h: + * DAnCE/ciao/Servant_Impl_T.h: + * DAnCE/ciao/StandardConfigurator_Impl.h: + * DAnCE/ciao/Swapping_Servant_Home_Impl_T.h: + * DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h: + * ciao/ComponentInstallation_Impl.h: + * ciao/ComponentServer_Impl.h: + * ciao/Container_Impl.h: + * ciao/HomeRegistrar_i.h: + * ciao/Home_Servant_Impl_T.h: + * ciao/Servant_Impl_T.h: + * ciao/ServerActivator_Impl.h: + * ciao/StandardConfigurator_Impl.h: + * docs/templates/CIAO_Glue_Session_Template.h: + * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h: + * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h: + * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h: + * examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h: + * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h: + * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h: + * performance-tests/Benchmark/LatencyTest.h: + * performance-tests/Benchmark/RoundTripServer/LatencyTest.h: + * tools/Assembly_Deployer/Assembly_Impl.h: + * tools/Assembly_Deployer/Assembly_Service_Impl.h: + * tools/Daemon/Daemon_Impl.h: + * tools/Simple_Component_Server/Simple_Server_i.h: + All servants are reference counted by default, no need anymore to + derive the servant from RefCountServantBase + Sat Jul 2 12:16:49 2005 Cassia Tatibana <cassia@dre.vanderbilt.edu> - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: * DAnCE/NodeManager/NodeDaemon_Impl.cpp: @@ -10,19 +53,19 @@ Fri Jul 1 08:42:27 2005 William Otte <wotte@dre.vanderbilt.edu> * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp * DAnCE/NodeManager/NodeDaemon_Impl.cpp - + Fixed compile errors with emulated exceptions turned on. - + Thu Jun 30 23:34:40 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> * DAnCE/tests/Minimum/Receiver/Receiver_exec.cpp: * DAnCE/tests/Minimum/Receiver/Receiver_exec.h: * DAnCE/tests/Minimum/Sender/Sender_exec.cpp: * DAnCE/tests/Minimum/Sender/Sender_exec.h: - + More overlooked changes to exec files corresponding to CIDL compiler code generation changes of - + Wed Jun 22 23:20:04 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> Thu Jun 30 12:36:06 2005 William Otte <wotte@atl.lmco.com> @@ -33,7 +76,7 @@ Thu Jun 30 12:36:06 2005 William Otte <wotte@atl.lmco.com> Added DAM_Map to the Plan_Launcher directory, as make wouldn't handle the relative reference properly. - + Thu Jun 30 09:29:24 2005 William Otte <wotte@dre.vanderbilt.edu> * DAnCE/new_RepositoryManager/RMadmin.cpp @@ -54,7 +97,7 @@ Thu Jun 30 09:59:17 2005 William Otte <wotte@atl.lmco.com> * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h Factored out the plan launcher capability into a shared library so - applications can use its functionality. + applications can use its functionality. Thu Jun 30 04:33:35 2005 ming xiong <mxiong@dre.vanderbilt.edu> @@ -64,11 +107,11 @@ Thu Jun 30 04:33:35 2005 ming xiong <mxiong@dre.vanderbilt.edu> * DAnCE/ComponentPackager/PDL_Handler.cpp * DAnCE/ComponentPackager/PDL_Handler.h * DAnCE/ComponentPackager/Base_Packager.cpp - + Added a release operation for destructor of PDL_Handler;Changed the definition of input parameter for CPK_Packager::createPackager to const to indicate it can not be changed - + Thu Jun 30 00:37:35 EDT 2005 Stoyan Paunov <s.paunov@vanderbilt.edu> * DAnCE/new_RepositoryManager/RMadmin.cpp @@ -93,7 +136,7 @@ Wed Jun 29 16:38:42 2005 Ming Xiong <mxiong@dre.vanderbilt.edu> * DAnCE/ComponentPackager/Base_Packager.h * DAnCE/ComponentPackager/CPK_Packager.h * DAnCE/ComponentPackager/CPK_Packager.h - + Changed a couplfe of places to meet the Doxygen test and TChar test for bin/fuzz.pl @@ -112,13 +155,13 @@ Wed Jun 29 16:28:52 2005 William Otte <wotte@dre.vanderbilt.edu> * DAnCE/ciao/Deployment.idl Merged dance_multiple_assemblies to main. This merge - contains code necessary to be able to deploy multiple assemblies + contains code necessary to be able to deploy multiple assemblies into a single NodeManager. Wed Jun 29 18:09:11 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - + Added check for successful opening of target file, which prevents a crash when the file open is unsuccessful, for example when write permissions are denied in the directory. Thanks to Will diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h index f5f674a0a8e..dbf6364a60b 100644 --- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h +++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h @@ -48,8 +48,7 @@ namespace CIAO * nodes. It specializes the ApplicationManager abstract interface. */ class DomainApplicationManager_Export DomainApplicationManager_Impl - : public virtual POA_Deployment::DomainApplicationManager, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Deployment::DomainApplicationManager { public: /// Define the type which contains a list of DnC artifacts. @@ -170,7 +169,7 @@ namespace CIAO virtual ::Deployment::DeploymentPlan * getPlan (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - /** + /** * This is a helper function to destroy the NodeAppManager. * Since we don't want to do so in the destructor so we will * ask the ExecutionManager to do this on us when the same IDL @@ -183,8 +182,8 @@ namespace CIAO protected: /// Destructor - virtual ~DomainApplicationManager_Impl (void); - + virtual ~DomainApplicationManager_Impl (void); + /** * (1) Parse the global deployment plan, get the total number of * child plans included in the global plan, and get the list of diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h index 1d009de77a6..3789cc9d8ff 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h +++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h @@ -46,8 +46,7 @@ namespace CIAO { class ExecutionManager_Impl - : public virtual POA_CIAO::ExecutionManagerDaemon, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::ExecutionManagerDaemon { public: diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h index 085f08f66fc..8d596c03835 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h +++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h @@ -44,8 +44,7 @@ namespace CIAO * */ class Execution_Manager_Impl - : public virtual POA_CIAO::ExecutionManagerDaemon, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::ExecutionManagerDaemon { public: Execution_Manager_Impl (CORBA::ORB_ptr orb, diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h index af76f2020ff..7ce8858be8e 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h @@ -37,8 +37,7 @@ namespace CIAO * @class NodeApplicationManager_Impl */ class CIAO_NAM_Export NodeApplicationManager_Impl - : public virtual POA_Deployment::NodeApplicationManager, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Deployment::NodeApplicationManager { public: /// Constructor diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h index f9ae5df23b5..947195e1aeb 100644 --- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h +++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h @@ -46,8 +46,7 @@ namespace CIAO * */ class NodeDaemon_Impl - : public virtual POA_CIAO::NodeDaemon, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::NodeDaemon { public: @@ -58,11 +57,11 @@ namespace CIAO const char * nodeapp_loc, int spawn_delay) ACE_THROW_SPEC ((CORBA::SystemException)); - + /// Initializes the NodeDaemon. virtual void init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + /// POA operation.. virtual PortableServer::POA_ptr _default_POA (void); @@ -125,7 +124,7 @@ namespace CIAO // Cache reference of last NodeAppManager // Deployment::NodeApplicationManager_var manager_; - + NAM_Map map_; }; } diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h index e3f955bf984..cfb9e4f715b 100644 --- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h +++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h @@ -74,8 +74,7 @@ using xercesc::AbstractDOMParser; namespace CIAO { class RepositoryManager_Impl - : public virtual POA_CIAO::RepositoryManagerDaemon, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::RepositoryManagerDaemon { public: diff --git a/TAO/CIAO/DAnCE/ciao/Container_Impl.h b/TAO/CIAO/DAnCE/ciao/Container_Impl.h index 8e616108ae6..55b51a85464 100644 --- a/TAO/CIAO/DAnCE/ciao/Container_Impl.h +++ b/TAO/CIAO/DAnCE/ciao/Container_Impl.h @@ -46,8 +46,7 @@ namespace CIAO * components and homes. */ class CIAO_SERVER_Export Container_Impl - : public virtual POA_Deployment::Container, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Deployment::Container { public: /// Constructor diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h index 8af0d9e8c87..734a833672b 100644 --- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h +++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h @@ -50,8 +50,7 @@ namespace CIAO typename COMP_SVNT> class Home_Servant_Impl : public virtual BASE_SKEL, - public virtual Home_Servant_Impl_Base, - public virtual PortableServer::RefCountServantBase + public virtual Home_Servant_Impl_Base { public: Home_Servant_Impl (EXEC * exe, @@ -108,9 +107,9 @@ namespace CIAO ACE_Equal_To<PortableServer::ObjectId>, ACE_SYNCH_MUTEX> OBJREF_MAP; - + typedef OBJREF_MAP::iterator OBJ_ITERATOR; - + OBJREF_MAP objref_map_; }; } diff --git a/TAO/CIAO/DAnCE/ciao/NodeApp_CB_Impl.h b/TAO/CIAO/DAnCE/ciao/NodeApp_CB_Impl.h index 782c2d2348b..e14899f38ff 100644 --- a/TAO/CIAO/DAnCE/ciao/NodeApp_CB_Impl.h +++ b/TAO/CIAO/DAnCE/ciao/NodeApp_CB_Impl.h @@ -35,8 +35,7 @@ namespace CIAO * we will have an unique callback object. --Tao */ class Deployment_svnt_Export NodeApplication_Callback_Impl - : public virtual POA_CIAO::NodeApplication_Callback, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::NodeApplication_Callback { public: friend class NodeApplicationManager_Impl; diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h index f50078b72f6..b2dccf413d6 100644 --- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h +++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h @@ -58,8 +58,7 @@ namespace CIAO // implementation in a namespace Node_Application or whatever to // signify that it belongs to another software piece of CIAO? class CIAO_SERVER_Export NodeApplication_Impl - : public virtual POA_Deployment::NodeApplication, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Deployment::NodeApplication { public: /// Default constructor. diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h index 069f9a00927..b4da0013448 100644 --- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h +++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h @@ -38,22 +38,21 @@ namespace CIAO * This class implements navigation and other operations * common to all generated servants. */ - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, + template <typename BASE_SKEL, + typename EXEC, + typename EXEC_VAR, typename CONTEXT> class Servant_Impl : public virtual BASE_SKEL, - public virtual Servant_Impl_Base, - public virtual PortableServer::RefCountServantBase + public virtual Servant_Impl_Base { public: Servant_Impl (EXEC * exe, Components::CCMHome_ptr home, Home_Servant_Impl_Base *home_servant, Session_Container * c); - + virtual ~Servant_Impl (void); - + // Operations for CCMObject interface. virtual CORBA::Boolean @@ -100,14 +99,14 @@ namespace CIAO activate_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - protected: + protected: + + CORBA::Boolean activated_; + CORBA::Boolean pre_activated_; + CORBA::Boolean post_activated_; - CORBA::Boolean activated_; - CORBA::Boolean pre_activated_; - CORBA::Boolean post_activated_; + EXEC_VAR executor_; - EXEC_VAR executor_; - CONTEXT * context_; }; } diff --git a/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h b/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h index 0395f8adc10..d7184c74647 100644 --- a/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h +++ b/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h @@ -42,8 +42,7 @@ namespace CIAO * defined in the meta data. */ class CIAO_SERVER_Export StandardConfigurator_Impl - : public virtual POA_Components::StandardConfigurator, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Components::StandardConfigurator { public: /// Constructor diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h index d9b7168f932..76bc3a09f0f 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h @@ -50,8 +50,7 @@ namespace CIAO typename COMP_SVNT> class Swapping_Home_Servant_Impl : public virtual BASE_SKEL, - public virtual Home_Servant_Impl_Base, - public virtual PortableServer::RefCountServantBase + public virtual Home_Servant_Impl_Base { public: Swapping_Home_Servant_Impl (EXEC * exe, diff --git a/TAO/CIAO/DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h index 049a15f1dd6..483e830a278 100644 --- a/TAO/CIAO/DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h +++ b/TAO/CIAO/DAnCE/new_RepositoryManager/new_RepositoryManager_Impl.h @@ -31,22 +31,23 @@ namespace const static char* RM_STORAGE_PATH = "./RepositoryDir"; } -class CIAO_new_RepositoryManagerDaemon_i : public virtual POA_CIAO::new_RepositoryManagerDaemon, public virtual PortableServer::RefCountServantBase +class CIAO_new_RepositoryManagerDaemon_i : + public virtual POA_CIAO::new_RepositoryManagerDaemon { public: - /// Constructor + /// Constructor CIAO_new_RepositoryManagerDaemon_i (CORBA::ORB_ptr the_orb); - - /// Destructor + + /// Destructor virtual ~CIAO_new_RepositoryManagerDaemon_i (void); - + /// shutdown method to shut down the orb gracefully virtual void shutdown () ACE_THROW_SPEC ((CORBA::SystemException)); - + /// This method allow you to install a package into the RM virtual void installPackage (const char * installationName, @@ -56,22 +57,22 @@ public: ::Deployment::NameExists, ::Deployment::PackageError)); - /// This method parse the depoyment plan in a package and return the - /// corresponding structure. You need to provide the name of the + /// This method parse the depoyment plan in a package and return the + /// corresponding structure. You need to provide the name of the /// package whose deployment plan you want to get . If no plan is /// found in the package, an exception is thrown virtual ::Deployment::DeploymentPlan * retrievePlan (const char * packageName) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::NoPlan)); - + /// find a package and return it if installed in the RM /// else throw an exception virtual ::Deployment::Package * findPackageByName (const char * name) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::NoSuchName)); - + /// find an implementation (.dll, .so) by its name and return it if installed in the RM /// else throw an exception. You need to specify the package in which the RM /// is to look for the implementation @@ -80,24 +81,24 @@ public: const char * package_name) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::NoSuchName)); - + /// not implemented virtual ::Deployment::Package * findPackageByUUID (const char * UUID) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::NoSuchName)); - + ///not implemented virtual ::Deployment::Implementation * findImplementationByUUID (const char * UUID) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::NoSuchName)); - + /// get the names of all packages currently installed in the RM virtual ::CORBA::StringSeq * getAllPackageNames () ACE_THROW_SPEC ((CORBA::SystemException)); - + /// Find out if the package was installed in the repository, /// delete it if found or throw and exception otherwise virtual @@ -112,8 +113,8 @@ protected: ///returns 1 on success /// -1 on error - int write_to_disk (const char* full_path, - const CORBA::Octet* buffer, + int write_to_disk (const char* full_path, + const CORBA::Octet* buffer, size_t length); @@ -122,13 +123,13 @@ protected: /// 0 on already exists and replace == false /// -1 on error - int write_to_disk (const char* full_path, + int write_to_disk (const char* full_path, ACE_Message_Block& mb, bool replace = true); ///function to read the contents of a file from disk into a CORBA::OctetSeq - ///returns a pointer to a CORBA::Octet buffer and updated the lenght on success + ///returns a pointer to a CORBA::Octet buffer and updated the lenght on success /// 0 on failure CORBA::Octet* read_from_disk (const char* full_path, size_t &lenght); @@ -139,7 +140,7 @@ private: /// Key: Package name of CString type or /// Value: The location of the local copy of the package - ///Based on the synchronization needed we can parametrize this with either + ///Based on the synchronization needed we can parametrize this with either ///ACE_Null_Mutex or ACE_RW_Mutex typedef ACE_Hash_Map_Manager_Ex<ACE_CString, diff --git a/TAO/CIAO/ciao/ComponentInstallation_Impl.h b/TAO/CIAO/ciao/ComponentInstallation_Impl.h index db850b9296b..b2c70d8fefd 100644 --- a/TAO/CIAO/ciao/ComponentInstallation_Impl.h +++ b/TAO/CIAO/ciao/ComponentInstallation_Impl.h @@ -39,8 +39,7 @@ namespace CIAO * used to manage the lifecycle of containers running on the server. */ class CIAO_SERVER_Export ComponentInstallation_Impl - : public virtual POA_Components::Deployment::ComponentInstallation, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Components::Deployment::ComponentInstallation { public: /// Constructor diff --git a/TAO/CIAO/ciao/ComponentServer_Impl.h b/TAO/CIAO/ciao/ComponentServer_Impl.h index d715da0a2cd..ffcf991a55a 100644 --- a/TAO/CIAO/ciao/ComponentServer_Impl.h +++ b/TAO/CIAO/ciao/ComponentServer_Impl.h @@ -41,8 +41,7 @@ namespace CIAO * used to manage the lifecycle of containers running on the server. */ class CIAO_SERVER_Export ComponentServer_Impl - : public virtual POA_Components::Deployment::ComponentServer, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Components::Deployment::ComponentServer { public: /// Constructor diff --git a/TAO/CIAO/ciao/Container_Impl.h b/TAO/CIAO/ciao/Container_Impl.h index b0c7f9c98ec..a66a56eec15 100644 --- a/TAO/CIAO/ciao/Container_Impl.h +++ b/TAO/CIAO/ciao/Container_Impl.h @@ -50,8 +50,7 @@ namespace CIAO * homes. */ class CIAO_SERVER_Export Container_Impl - : public virtual POA_Components::Deployment::Container, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Components::Deployment::Container { public: /// Constructor diff --git a/TAO/CIAO/ciao/HomeRegistrar_i.h b/TAO/CIAO/ciao/HomeRegistrar_i.h index 910c74b3dde..00602f9f474 100644 --- a/TAO/CIAO/ciao/HomeRegistrar_i.h +++ b/TAO/CIAO/ciao/HomeRegistrar_i.h @@ -25,8 +25,7 @@ namespace CIAO { class CIAO_SERVER_Export HomeRegistrar_Impl - : public virtual POA_CIAO::HomeRegistrar, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::HomeRegistrar { public: /** diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_T.h b/TAO/CIAO/ciao/Home_Servant_Impl_T.h index eed5642f786..1808ef9a372 100644 --- a/TAO/CIAO/ciao/Home_Servant_Impl_T.h +++ b/TAO/CIAO/ciao/Home_Servant_Impl_T.h @@ -40,8 +40,8 @@ namespace CIAO * This class implements operations * common to all generated home servants. */ - template <typename BASE_SKEL, - typename EXEC, + template <typename BASE_SKEL, + typename EXEC, typename EXEC_VAR, typename COMP, typename COMP_VAR, @@ -50,16 +50,15 @@ namespace CIAO typename COMP_SVNT> class Home_Servant_Impl : public virtual BASE_SKEL, - public virtual Home_Servant_Impl_Base, - public virtual PortableServer::RefCountServantBase + public virtual Home_Servant_Impl_Base { public: Home_Servant_Impl (EXEC * exe, Session_Container * c, const char *ins_name); - + virtual ~Home_Servant_Impl (void); - + // Operations for CCMHome interface. virtual void @@ -67,7 +66,7 @@ namespace CIAO ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); - + // Operations for keyless home interface. virtual ::Components::CCMObject_ptr @@ -89,7 +88,7 @@ namespace CIAO _ciao_activate_component (COMP_EXEC *exe ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + void _ciao_passivate_component (COMP *comp ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -119,4 +118,4 @@ namespace CIAO #include /**/ "ace/post.h" #endif /* CIAO_HOME_SERVANT_IMPL_T_H */ - + diff --git a/TAO/CIAO/ciao/Servant_Impl_T.h b/TAO/CIAO/ciao/Servant_Impl_T.h index 99ac419df6f..5b76e6c986d 100644 --- a/TAO/CIAO/ciao/Servant_Impl_T.h +++ b/TAO/CIAO/ciao/Servant_Impl_T.h @@ -38,22 +38,21 @@ namespace CIAO * This class implements navigation and other operations * common to all generated servants. */ - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, + template <typename BASE_SKEL, + typename EXEC, + typename EXEC_VAR, typename CONTEXT> class Servant_Impl : public virtual BASE_SKEL, - public virtual Servant_Impl_Base, - public virtual PortableServer::RefCountServantBase + public virtual Servant_Impl_Base { public: Servant_Impl (EXEC * exe, Components::CCMHome_ptr home, Home_Servant_Impl_Base *home_servant, Session_Container * c); - + virtual ~Servant_Impl (void); - + // Operations for CCMObject interface. virtual CORBA::Boolean @@ -88,10 +87,10 @@ namespace CIAO _ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - protected: - EXEC_VAR executor_; - - CONTEXT * context_; + protected: + EXEC_VAR executor_; + + CONTEXT * context_; }; } diff --git a/TAO/CIAO/ciao/ServerActivator_Impl.h b/TAO/CIAO/ciao/ServerActivator_Impl.h index 66237858f86..3aeace7dada 100644 --- a/TAO/CIAO/ciao/ServerActivator_Impl.h +++ b/TAO/CIAO/ciao/ServerActivator_Impl.h @@ -42,8 +42,7 @@ namespace CIAO * Notice that this implementation is *NOT* thread-safe. */ class CIAO_SERVER_Export Activator_Callback_Impl - : public virtual POA_CIAO::Activator_Callback, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::Activator_Callback { public: friend class ServerActivator_Impl; @@ -97,8 +96,7 @@ namespace CIAO * used to manage the lifecycle of containers running on the server. */ class CIAO_SERVER_Export ServerActivator_Impl - : public virtual POA_Components::Deployment::ServerActivator, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Components::Deployment::ServerActivator { public: /// Constructor diff --git a/TAO/CIAO/ciao/StandardConfigurator_Impl.h b/TAO/CIAO/ciao/StandardConfigurator_Impl.h index 99e8e6bd892..c8a884164d7 100644 --- a/TAO/CIAO/ciao/StandardConfigurator_Impl.h +++ b/TAO/CIAO/ciao/StandardConfigurator_Impl.h @@ -42,8 +42,7 @@ namespace CIAO * defined in the meta data. */ class CIAO_SERVER_Export StandardConfigurator_Impl - : public virtual POA_Components::StandardConfigurator, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Components::StandardConfigurator { public: /// Constructor diff --git a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.h b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.h index 1ceb6f03485..053933f776e 100644 --- a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.h +++ b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.h @@ -56,8 +56,7 @@ namespace CIAO_GLUE ##foreach [facet type] in (all facet interface types in the original IDL) class [SERVANT]_Export [facet type]_Servant : - : public virtual POA_[facet type], // full skeleton name here - public virtual PortableServer::RefCountServantBase + : public virtual POA_[facet type] // full skeleton name here { public: // Constructor and destructor. @@ -254,8 +253,7 @@ namespace CIAO_GLUE ////////////////////////////////////////////////////////////////// // Component Servant Glue code implementation class [SERVANT]_Export [component name]_Servant - : public virtual POA_[component name], // full skeleton name here - public virtual PortableServer::RefCountServantBase + : public virtual POA_[component name] // full skeleton name here { public: // Ctor. @@ -325,8 +323,7 @@ namespace CIAO_GLUE // First we need to generate the event sink specific servant class [SERVANT]_Export [eventtype]Consumer_[consumer name]_Servant - : public virtual POA_[eventtype]Consumer, // full skeleton name here - public virtual PortableServer::RefCountServantBase + : public virtual POA_[eventtype]Consumer // full skeleton name here { public: // Constructor and destructor. @@ -594,8 +591,7 @@ namespace CIAO_GLUE // Foreach component home class [SERVANT]_Export [home name]_Servant : - public virtual POA_[home name], // full skeleton name here - public virtual PortableServer::RefCountServantBase + public virtual POA_[home name] // full skeleton name here { public: // Ctor. diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h index 93e43077166..a7d4667de57 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h @@ -41,9 +41,8 @@ namespace CIAO_GLUE_BasicSP { - class BMCLOSEDED_SVNT_Export ReadData_Servant - : public virtual POA_BasicSP::ReadData, - public virtual PortableServer::RefCountServantBase + class BMCLOSEDED_SVNT_Export ReadData_Servant : + public virtual POA_BasicSP::ReadData { public: ReadData_Servant ( @@ -252,8 +251,7 @@ namespace CIAO_GLUE_BasicSP }; class BMCLOSEDED_SVNT_Export BMClosedED_Servant - : public virtual POA_BasicSP::BMClosedED, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMClosedED { public: BMClosedED_Servant ( @@ -305,8 +303,7 @@ namespace CIAO_GLUE_BasicSP // Servant class for the in_avail consumer. class BMCLOSEDED_SVNT_Export DataAvailableConsumer_in_avail_Servant - : public virtual POA_BasicSP::DataAvailableConsumer, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::DataAvailableConsumer { public: DataAvailableConsumer_in_avail_Servant ( @@ -608,8 +605,7 @@ namespace CIAO_GLUE_BasicSP }; class BMCLOSEDED_SVNT_Export BMClosedEDHome_Servant - : public virtual POA_BasicSP::BMClosedEDHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMClosedEDHome { public: BMClosedEDHome_Servant ( diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h index 5d10773311c..8db002f8033 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h @@ -42,8 +42,7 @@ namespace CIAO_GLUE_BasicSP { class BMDEVICE_SVNT_Export ReadData_Servant - : public virtual POA_BasicSP::ReadData, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::ReadData { public: ReadData_Servant ( @@ -229,8 +228,7 @@ namespace CIAO_GLUE_BasicSP }; class BMDEVICE_SVNT_Export BMDevice_Servant - : public virtual POA_BasicSP::BMDevice, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMDevice { public: BMDevice_Servant ( @@ -263,8 +261,7 @@ namespace CIAO_GLUE_BasicSP // Servant class for the timeout consumer. class BMDEVICE_SVNT_Export TimeOutConsumer_timeout_Servant - : public virtual POA_BasicSP::TimeOutConsumer, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::TimeOutConsumer { public: TimeOutConsumer_timeout_Servant ( @@ -566,8 +563,7 @@ namespace CIAO_GLUE_BasicSP }; class BMDEVICE_SVNT_Export BMDeviceHome_Servant - : public virtual POA_BasicSP::BMDeviceHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMDeviceHome { public: BMDeviceHome_Servant ( diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h index fb6a2041366..b78c7750d39 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h @@ -145,8 +145,7 @@ namespace CIAO_GLUE_BasicSP }; class BMDISPLAY_SVNT_Export BMDisplay_Servant - : public virtual POA_BasicSP::BMDisplay, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMDisplay { public: BMDisplay_Servant ( @@ -158,8 +157,7 @@ namespace CIAO_GLUE_BasicSP // Servant class for the data_ready consumer. class BMDISPLAY_SVNT_Export DataAvailableConsumer_data_ready_Servant - : public virtual POA_BasicSP::DataAvailableConsumer, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::DataAvailableConsumer { public: DataAvailableConsumer_data_ready_Servant ( @@ -468,8 +466,7 @@ namespace CIAO_GLUE_BasicSP }; class BMDISPLAY_SVNT_Export BMDisplayHome_Servant - : public virtual POA_BasicSP::BMDisplayHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMDisplayHome { public: BMDisplayHome_Servant ( diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h index 01d6e183389..4b0f13c5067 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h @@ -195,8 +195,7 @@ namespace CIAO_GLUE_BasicSP }; class EC_SVNT_Export EC_Servant - : public virtual POA_BasicSP::EC, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::EC { public: EC_Servant ( @@ -256,7 +255,7 @@ namespace CIAO_GLUE_BasicSP ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void + virtual void hertz ( ::CORBA::Long ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -497,8 +496,7 @@ namespace CIAO_GLUE_BasicSP }; class EC_SVNT_Export ECHome_Servant - : public virtual POA_BasicSP::ECHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::ECHome { public: ECHome_Servant ( diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h index faf3634d317..a69cc0ef738 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h @@ -155,8 +155,7 @@ namespace MyImpl }; class RTEVENTSERVICE_EXEC_Export RTEventServiceSupplier_impl : - public virtual POA_RtecEventComm::PushSupplier, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecEventComm::PushSupplier { public: @@ -172,8 +171,7 @@ namespace MyImpl }; class RTEVENTSERVICE_EXEC_Export RTEventServiceConsumer_impl : - public virtual POA_RtecEventComm::PushConsumer, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecEventComm::PushConsumer { public: diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h index a2915e7cbfa..43b6b85ba82 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h @@ -37,8 +37,7 @@ namespace CIAO_GLUE_RtecEventChannelAdmin { class RTEVENTSERVICE_SVNT_Export EventChannel_Servant - : public virtual POA_RtecEventChannelAdmin::EventChannel, - public virtual PortableServer::RefCountServantBase + : public virtual POA_RtecEventChannelAdmin::EventChannel { public: EventChannel_Servant ( @@ -184,8 +183,7 @@ namespace CIAO_GLUE_BasicSP }; class RTEVENTSERVICE_SVNT_Export RTEventService_Servant - : public virtual POA_BasicSP::RTEventService, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::RTEventService { public: RTEventService_Servant ( @@ -438,8 +436,7 @@ namespace CIAO_GLUE_BasicSP }; class RTEVENTSERVICE_SVNT_Export RTEventServiceHome_Servant - : public virtual POA_BasicSP::RTEventServiceHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::RTEventServiceHome { public: RTEventServiceHome_Servant ( diff --git a/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h b/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h index 7511e9e8801..ad066166e6b 100644 --- a/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h +++ b/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h @@ -15,8 +15,7 @@ /// Implement the Test::LatencyTest interface class LatencyTest -: public virtual POA_Benchmark::LatencyTest, - public virtual PortableServer::RefCountServantBase +: public virtual POA_Benchmark::LatencyTest { public: /// Constructor diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h index 8ce052a7421..ec1878db753 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h @@ -14,9 +14,8 @@ #endif /* _MSC_VER */ /// Implement the Test::LatencyTest interface -class LatencyTest_Impl -: public virtual POA_Benchmark::LatencyTest - , public virtual PortableServer::RefCountServantBase +class LatencyTest_Impl : + public virtual POA_Benchmark::LatencyTest { public: /// Constructor diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h index 92346f78e96..f4ee5572b56 100644 --- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h +++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h @@ -45,8 +45,7 @@ namespace CIAO * used to manage the lifecycle of containers running on the server. */ class AssemblyFactory_Impl - : public virtual POA_Components::Deployment::AssemblyFactory, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Components::Deployment::AssemblyFactory { public: /// Constructor @@ -109,8 +108,7 @@ namespace CIAO * used to manage the lifecycle of containers running on the server. */ class Assembly_Impl - : public virtual POA_Components::Deployment::Assembly, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Components::Deployment::Assembly { public: /// Constructor diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Service_Impl.h b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Service_Impl.h index e03989f0de5..ec0801b5627 100644 --- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Service_Impl.h +++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Service_Impl.h @@ -24,8 +24,7 @@ namespace CIAO { class Assembly_Service_Impl - : public virtual POA_CIAO::Assembly_Service, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::Assembly_Service { public: /// Constructor diff --git a/TAO/CIAO/tools/Daemon/Daemon_Impl.h b/TAO/CIAO/tools/Daemon/Daemon_Impl.h index 853b91468fc..761b20e53e0 100644 --- a/TAO/CIAO/tools/Daemon/Daemon_Impl.h +++ b/TAO/CIAO/tools/Daemon/Daemon_Impl.h @@ -39,8 +39,7 @@ namespace CIAO * to acquire the */ class Daemon_Impl - : public virtual POA_CIAO::Daemon, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::Daemon { public: diff --git a/TAO/CIAO/tools/Simple_Component_Server/Simple_Server_i.h b/TAO/CIAO/tools/Simple_Component_Server/Simple_Server_i.h index 02c4972c4d7..a43d4fd1d74 100644 --- a/TAO/CIAO/tools/Simple_Component_Server/Simple_Server_i.h +++ b/TAO/CIAO/tools/Simple_Component_Server/Simple_Server_i.h @@ -24,8 +24,7 @@ namespace CIAO { class Simple_Server_i - : public virtual POA_CIAO::Simple_Server, - public virtual PortableServer::RefCountServantBase + : public virtual POA_CIAO::Simple_Server { public: /// Constructor |