diff options
74 files changed, 616 insertions, 616 deletions
diff --git a/CIAO/CIAO_DAnCE.mwc b/CIAO/CIAO_DAnCE.mwc index 54f5a4f572c..be8ad1b4393 100644 --- a/CIAO/CIAO_DAnCE.mwc +++ b/CIAO/CIAO_DAnCE.mwc @@ -5,6 +5,6 @@ workspace { ciao $(DANCE_ROOT) exclude { - DAnCE/tests + $(DANCE_ROOT)/tests } } diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h index 6a2901402d8..d9d8a7288f7 100644 --- a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h +++ b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.h @@ -21,10 +21,10 @@ namespace CIAO { public: // Temporary hack until Martin's artifact installation work can - // be implemented. + // be implemented. static const char * get_implementation (const char *name, const ::Deployment::DeploymentPlan &plan); - + static void create_attribute_configuration (const ::Deployment::Properties &props, ::Components::ConfigValues & values); struct Instance_Info @@ -34,8 +34,8 @@ namespace CIAO }; typedef std::map < std::string, Instance_Info > INSTANCES; - + }; } -#endif +#endif diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.h b/CIAO/ciao/Deployment/Handlers/Component_Handler.h index c0a1a61cdbc..63da3ff17d5 100644 --- a/CIAO/ciao/Deployment/Handlers/Component_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.h @@ -5,8 +5,8 @@ /** * @file Component_Handler.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef CIAO_COMPONENT_HANDLER_H @@ -32,23 +32,23 @@ namespace CIAO public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Component_Handler_i (void); - - // Destructor + + // Destructor virtual ~Component_Handler_i (void); - - virtual + + virtual ::CORBA::StringSeq * dependencies (void); virtual char * instance_type (void); - + virtual void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void remove_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, @@ -63,29 +63,29 @@ namespace CIAO ::CORBA::ULong , const ::CORBA::Any &); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::Any_out endpoint_reference); - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef); + ::CORBA::ULong instanceRef); virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: Deployment_Common::INSTANCES instances_; }; @@ -93,7 +93,7 @@ namespace CIAO extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr CIAO_Locality_Handler_Export create_Component_Handler (void); } diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.h b/CIAO/ciao/Deployment/Handlers/Connection_Handler.h index b3b8e0fae11..2444422b892 100644 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.h @@ -1,8 +1,8 @@ -/** +/** * @file Connection_Handler.h * @author William R. Otte <wotte@dre.vanderbilt.edu> * $Id$ - * + * * Common connection handling logic for components. */ @@ -20,29 +20,29 @@ namespace CIAO class Connection_Handler { public: - void + void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::Any_out endpoint_reference); - + void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - + private: void connect_facet (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::ULong endpoint, const ::CORBA::Any & provided_reference); - + void connect_receptacle (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::ULong endpoint, const ::CORBA::Any & provided_reference); - + void connect_publisher (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::ULong endpoint, @@ -52,37 +52,37 @@ namespace CIAO ::CORBA::ULong connectionRef, ::CORBA::ULong endpoint, const ::CORBA::Any & provided_reference); - + void connect_consumer (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::ULong endpoint, const ::CORBA::Any & provided_reference); - + void disconnect_facet (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - - + + void disconnect_receptacle (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - + void disconnect_publisher (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - + void disconnect_subscriber (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - + void connect_local_port (const char *facet_id, const char *facet_port, const char *receptacle_id, const char *receptacle_port); - + bool is_local_facet (const ::Deployment::PlanConnectionDescription &conn); - + typedef std::pair < ::Components::Cookie_var, ::Components::CCMObject_var> CONNECTION_INFO; typedef std::map <std::string, CONNECTION_INFO> COOKIES; - + COOKIES cookies_; }; } diff --git a/CIAO/ciao/Deployment/Handlers/Container_Handler.h b/CIAO/ciao/Deployment/Handlers/Container_Handler.h index 2d6bf4a2fe0..444f26b4a4f 100644 --- a/CIAO/ciao/Deployment/Handlers/Container_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Container_Handler.h @@ -5,8 +5,8 @@ /** * @file Container_Handler.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef CIAO_CONTAINER_HANDLER_H @@ -33,23 +33,23 @@ namespace CIAO public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Container_Handler_i (void); - - // Destructor + + // Destructor virtual ~Container_Handler_i (void); - + virtual char * instance_type (void); - virtual + virtual ::CORBA::StringSeq * dependencies (void); - + virtual void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -63,8 +63,8 @@ namespace CIAO void remove_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - - virtual + + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::Any_out endpoint_reference); @@ -72,18 +72,18 @@ namespace CIAO void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - - virtual + + virtual void instance_configured (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef); virtual void configure(const Deployment::Properties&); - + virtual void close (void); private: @@ -94,7 +94,7 @@ namespace CIAO extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr CIAO_Locality_Handler_Export create_Container_Handler (void); } diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.h b/CIAO/ciao/Deployment/Handlers/Home_Handler.h index 671e025cb05..73cd48cdd12 100644 --- a/CIAO/ciao/Deployment/Handlers/Home_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Home_Handler.h @@ -5,8 +5,8 @@ /** * @file Home_Handler.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef CIAO_HOME_HANDLER_H @@ -31,23 +31,23 @@ namespace CIAO public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Home_Handler_i (void); - - // Destructor + + // Destructor virtual ~Home_Handler_i (void); - virtual + virtual ::CORBA::StringSeq * dependencies (void); - + virtual char * instance_type (void); - + virtual void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -62,27 +62,27 @@ namespace CIAO ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, - ::CORBA::Any_out endpoint_reference); + ::CORBA::Any_out endpoint_reference); virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef); + ::CORBA::ULong instanceRef); virtual void configure(const Deployment::Properties&); - + virtual void close (void); private: @@ -92,7 +92,7 @@ namespace CIAO extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr CIAO_Locality_Handler_Export create_Home_Handler (void); } diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h index ea196467fb5..17f86cef9f8 100644 --- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.h @@ -5,8 +5,8 @@ /** * @file Homed_Component_Handler.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef CIAO_HOMED_COMPONENT_HANDLER_H @@ -32,23 +32,23 @@ namespace CIAO public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Homed_Component_Handler_i (); - - // Destructor + + // Destructor virtual ~Homed_Component_Handler_i (void); - virtual + virtual ::CORBA::StringSeq * dependencies (void); - + virtual char * instance_type (void); - + virtual void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -63,37 +63,37 @@ namespace CIAO ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::Any_out endpoint_reference); - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan & plan, - ::CORBA::ULong instanceRef); + ::CORBA::ULong instanceRef); virtual void configure(const Deployment::Properties&); - + virtual void close (void); private: - Deployment_Common::INSTANCES instances_; + Deployment_Common::INSTANCES instances_; }; } extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr CIAO_Locality_Handler_Export create_Homed_Component_Handler (void); } diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h index 354cdbbf430..26cc29ed219 100644 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h +++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h @@ -3,7 +3,7 @@ * @file Deployment_Interceptors.h * @author William R. Otte <wotte@dre.vanderbilt.edu> * - * Initial deployment interceptors for use in DAnCE. + * Initial deployment interceptors for use in DAnCE. */ #ifndef DEPLOYMENT_INTERCEPTORS_H @@ -25,17 +25,17 @@ namespace CIAO : public virtual DAnCE::DeploymentInterceptor_Base { public: - // Constructor - + // Constructor + CIAO_StoreReferences_i (void); - - // Destructor + + // Destructor virtual ~CIAO_StoreReferences_i (void); - + virtual void pre_install (::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef); - + virtual void post_install (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong index, @@ -44,7 +44,7 @@ namespace CIAO virtual void configure(const Deployment::Properties&); - + CORBA::ORB_var orb_; private: CosNaming::NamingContext_var ctx_; @@ -54,17 +54,17 @@ namespace CIAO : public virtual DAnCE::DeploymentInterceptor_Base { public: - // Constructor + // Constructor CIAO_ReferenceLookup_i (void); - - // Destructor + + // Destructor virtual ~CIAO_ReferenceLookup_i (void); - + virtual void pre_connect (::Deployment::DeploymentPlan & plan, ::CORBA::ULong connection_index, ::CORBA::Any & provided_reference); - + virtual void post_connect (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, @@ -77,7 +77,7 @@ namespace CIAO extern "C" { - ::DAnCE::DeploymentInterceptor_ptr + ::DAnCE::DeploymentInterceptor_ptr CIAO_Deployment_Interceptors_Export create_CIAO_StoreReferences (void); } diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h index f6349b17c96..24861716dae 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.h @@ -18,7 +18,7 @@ namespace CIAO_AsynchT_Sender_Impl { typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::UShort > Atomic_UShort; - + /// Worker thread for asynchronous invocations class asynch_foo_generator : public virtual ACE_Task_Base { diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h index 2d8b73f2a0b..6c80c14c35b 100644 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.h @@ -17,7 +17,7 @@ namespace CIAO_GetComp_Sender_Impl { - + class MyFoo_callback_exec_i : public virtual ::GetComp::CCM_AMI4CCM_MyFooReplyHandler, public virtual ::CORBA::LocalObject diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h index 64b774ba4f6..69e1f1e4bee 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.h @@ -23,7 +23,7 @@ namespace CIAO_InterInArgsT_Sender_Impl long expect_id, const char* error_string, const char* func); - + /// Worker thread for asynchronous invocations class asynch_foo_generator : public virtual ACE_Task_Base { diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h index 6392b756341..fbd1b8414b7 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.h @@ -24,7 +24,7 @@ namespace CIAO_InterInOutT_Sender_Impl long expect_id, const char* error_string, const char* func); - + /// Worker thread for asynchronous invocations class asynch_foo_generator : public virtual ACE_Task_Base { diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h index 93536082399..de72284ecbc 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.h @@ -18,7 +18,7 @@ namespace CIAO_InterMulti_Sender_Impl { typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::UShort > Atomic_UShort; - + /// Worker threads for asynchronous invocations class asynch_one_generator : public virtual ACE_Task_Base { diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h index a45e31084b5..6229241907a 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.h @@ -53,7 +53,7 @@ namespace CIAO_InterReturnT_Sender_Impl virtual void ret_void_excep ( ::CCM_AMI::ExceptionHolder_ptr excep_holder); - virtual void ret_long (::CORBA::Long ami_return_val, + virtual void ret_long (::CORBA::Long ami_return_val, const char * answer, CORBA::Long l_cmd); virtual void ret_long_excep ( ::CCM_AMI::ExceptionHolder_ptr excep_holder); diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h index b4d8c9a295b..859379eaa24 100644 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.h @@ -18,7 +18,7 @@ namespace CIAO_OneProcess_Sender_Impl { typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::UShort > Atomic_UShort; - + /// Worker thread for asynchronous invocations class asynch_foo_generator : public virtual ACE_Task_Base { diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h index d5feece94fd..68fc3d87eaa 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h @@ -25,7 +25,7 @@ namespace CIAO_OneReplyH_Receiver_Impl virtual ::CORBA::Long foo (const char * in_str, ::CORBA::Long cmd, ::CORBA::String_out answer); - virtual void bar (const char * in_str, ::CORBA::Long cmd, + virtual void bar (const char * in_str, ::CORBA::Long cmd, ::CORBA::String_out answer, ::CORBA::Long_out l_cmd); }; diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h index f1cd0a83356..d4f957a28f1 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.h @@ -23,7 +23,7 @@ namespace CIAO_OneReplyH_Sender_Impl long expect_id, const char* error_string, const char* func); - + /// Worker thread for asynchronous invocations class asynch_foo_generator : public virtual ACE_Task_Base { diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h index b69b4612830..b6c8bc48490 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.h @@ -18,7 +18,7 @@ namespace CIAO_UsesSM_Sender_Impl { typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::UShort > Atomic_UShort; - + /// Worker threads for asynchronous invocations class asynch_foo_generator : public virtual ACE_Task_Base { diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h index 5b77a849953..9bef01713f3 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h @@ -40,7 +40,7 @@ namespace CIAO_UsesMulti_Receiver_Impl virtual ~Receiver_exec_i (void); virtual ::UsesMulti::CCM_One_ptr get_do_my_one (void); - + virtual void set_session_context (::Components::SessionContext_ptr ctx); virtual void configuration_complete (void); diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h index 5693a917090..567e46f98a7 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.h @@ -18,7 +18,7 @@ namespace CIAO_UsesMulti_Sender_Impl { typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::UShort > Atomic_UShort; - + /// Worker threads for asynchronous invocations class asynch_foo_generator : public virtual ACE_Task_Base { diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h index 9fde6a3823c..578a99c812c 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h @@ -42,7 +42,7 @@ namespace CIAO_Hello_Receiver_comp_Impl { - + // TAO_IDL - Generated from // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exh.cpp:53 class do_my_foo_exec_i @@ -53,41 +53,41 @@ namespace CIAO_Hello_Receiver_comp_Impl do_my_foo_exec_i ( ::Hello::CCM_Receiver_comp_Context_ptr ctx); virtual ~do_my_foo_exec_i (void); - + // Operations and attributes from ::Hello::MyFoo_obj - + virtual ::CORBA::Long foo ( const char * in_str, ::CORBA::String_out answer); - + virtual void hello ( ::CORBA::Long_out answer); - + // TAO_IDL - Generated from // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:36 - + virtual ::CORBA::Short rw_attrib (void); - + // TAO_IDL - Generated from // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:36 - + virtual void rw_attrib ( ::CORBA::Short rw_attrib); - + // TAO_IDL - Generated from // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:36 - + virtual ::CORBA::Short ro_attrib (void); - + private: ::Hello::CCM_Receiver_comp_Context_var ciao_context_; }; - + class Receiver_comp_exec_i : public virtual Receiver_comp_Exec, public virtual ::CORBA::LocalObject @@ -95,37 +95,37 @@ namespace CIAO_Hello_Receiver_comp_Impl public: Receiver_comp_exec_i (void); virtual ~Receiver_comp_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::Hello::CCM_MyFoo_obj_ptr get_do_my_foo (void); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context (::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - + private: ::Hello::CCM_Receiver_comp_Context_var ciao_context_; ::Hello::CCM_MyFoo_obj_var ciao_do_my_foo_; }; - + extern "C" ::Components::EnterpriseComponent_ptr create_Hello_Receiver_comp_Impl (void); } diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h index 3e3ee1e42c9..57165cf6075 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.h @@ -42,7 +42,7 @@ namespace CIAO_Hello_Sender_comp_Impl { - + class Sender_comp_exec_i : public virtual Sender_comp_Exec, public virtual ::CORBA::LocalObject @@ -50,33 +50,33 @@ namespace CIAO_Hello_Sender_comp_Impl public: Sender_comp_exec_i (void); virtual ~Sender_comp_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - + //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context (::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - + private: ::Hello::CCM_Sender_comp_Context_var ciao_context_; }; - + extern "C" ::Components::EnterpriseComponent_ptr create_Hello_Sender_comp_Impl (void); } diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h index da33fa9b3cc..56c1461d26b 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h @@ -125,7 +125,7 @@ namespace CIAO_Hello_Receiver_Impl virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_out_status (void); - + virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_info_out_connector_status (void); diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h index 8c7245023b5..cfa991e6d9b 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h @@ -55,7 +55,7 @@ namespace CIAO_Hello_Sender_Impl }; - class pulse_Generator : + class pulse_Generator : public ACE_Event_Handler { public: diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h index 744bcb3357d..c4451c3d259 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.h @@ -24,26 +24,26 @@ namespace CIAO_DDS_Pub_Impl public: DDS_Pub_exec_i (void); virtual ~DDS_Pub_exec_i (void); - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::CCM_DDS_Pub_Context_var context_; }; - + extern "C" DDS_PUB_EXEC_Export ::Components::EnterpriseComponent_ptr create_DDS_Pub_Impl (void); } diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h index 52f57318dbf..830fd52f77e 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h @@ -46,7 +46,7 @@ namespace CIAO_Single_Service_Impl { // TAO_IDL - Generated from // be/be_visitor_component/facet_exh.cpp:53 - + class SINGLE_SERVICE_EXEC_Export Simple_Service_exec_i : public virtual ::CCM_Simple_Service, public virtual ::CORBA::LocalObject @@ -54,16 +54,16 @@ namespace CIAO_Single_Service_Impl public: Simple_Service_exec_i (void); virtual ~Simple_Service_exec_i (void); - + // Operations and attributes from ::Simple_Service - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 - + virtual void ping (void); }; - + class SINGLE_SERVICE_EXEC_Export Single_Service_exec_i : public virtual Single_Service_Exec, public virtual ::CORBA::LocalObject @@ -71,39 +71,39 @@ namespace CIAO_Single_Service_Impl public: Single_Service_exec_i (void); virtual ~Single_Service_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::CCM_Simple_Service_ptr get_ping_port (void); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::CCM_Single_Service_Context_var context_; }; - + extern "C" SINGLE_SERVICE_EXEC_Export ::Components::EnterpriseComponent_ptr create_Single_Service_Impl (void); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h index 35461982c25..362911f3895 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h @@ -66,7 +66,7 @@ protected: DataReader_type; typedef ::CIAO::DDS4CCM::CCM_DDS_ContentFilterSetting_i ContentFilterSetting_type; - + /** * DDS_Subscriber_Base_T */ diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h index af805f53685..4b72744e5f0 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h @@ -22,7 +22,7 @@ public: ::DDS::CCM_DataWriter_ptr get_dds_entity (void); void configuration_complete ( - typename CCM_TYPE::base_type::_ptr_type component, + typename CCM_TYPE::base_type::_ptr_type component, ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, const char* library_name, diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h index 92108699563..7951ee197e8 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h @@ -42,13 +42,13 @@ public: void remove (::DDS::Publisher_ptr publisher); -private: +private: typedef ::CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE> Writer_type; typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE> DataWriterListener_type; typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE> DataWriter_type; - + /** * DDS_Write */ diff --git a/CIAO/connectors/dds4ccm/impl/DataReader.h b/CIAO/connectors/dds4ccm/impl/DataReader.h index a662740fc38..c475ee539ef 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReader.h +++ b/CIAO/connectors/dds4ccm/impl/DataReader.h @@ -31,7 +31,7 @@ namespace CIAO { public: virtual ~CCM_DDS_DataReader_Base (void); - + virtual DDSDataReader * get_impl (void) = 0; }; } diff --git a/CIAO/connectors/dds4ccm/impl/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/DataReader_T.h index 62b6278e77f..4d78f0e5a87 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReader_T.h +++ b/CIAO/connectors/dds4ccm/impl/DataReader_T.h @@ -189,7 +189,7 @@ namespace CIAO ::DDS::StatusMask get_mask (void); virtual DDSDataReader * get_impl (void); - + private: typename DDS_TYPE::datareader_type * impl_; diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h index 13c5ecd0299..79a945bc602 100644 --- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h +++ b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h @@ -34,7 +34,7 @@ namespace CIAO { public: LocalObject_Auto_Ptr_T (void); - + ~LocalObject_Auto_Ptr_T (void); explicit LocalObject_Auto_Ptr_T (LOCAL_OBJECT* lobject); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h index 5b1122e1db8..53eb1d5bad6 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h @@ -40,7 +40,7 @@ operator<<= (::CCM_DDS::ReadInfo& ccm_dds_readinfo, const ::DDS_SampleInfo& samp ccm_dds_readinfo.source_timestamp <<= sample_info.source_timestamp; #else ccm_dds_readinfo.source_timestamp = sample_info.source_timestamp; -#endif +#endif ccm_dds_readinfo.access_status <<= sample_info.sample_state; #if (CIAO_DDS4CCM_NDDS==1) ccm_dds_readinfo.instance_handle <<= sample_info.instance_handle; diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h index 979c5d1c0f1..5d10522bf6f 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h @@ -15,77 +15,77 @@ class DDS_PSAT_Event_Connector_T { return CCM_TYPE::psat_writer_type::_nil (); } - + virtual typename CCM_TYPE::datawriter_type::_ptr_type get_supplier_dds_entity (void) { return CCM_TYPE::datawriter_type::_nil (); } - + virtual typename CCM_TYPE::reader_type::_ptr_type get_consumer_data (void) { return CCM_TYPE::reader_type::_nil (); } - + virtual typename CCM_TYPE::datalistenercontrol_type::_ptr_type get_consumer_data_control (void) { return CCM_TYPE::datalistenercontrol_type::_nil (); } - + virtual typename CCM_TYPE::datareader_type::_ptr_type get_consumer_dds_entity (void) { return CCM_TYPE::datareader_type::_nil (); } - + virtual typename CCM_TYPE::psat_buffercontrol_type::_ptr_type get_consumer_buffer_control (void) { return CCM_TYPE::psat_buffercontrol_type::_nil (); } - + virtual ::CCM_DDS_PSAT::SharedMemoryConfig * shared_memory_config (void) { return 0; } - + virtual void shared_memory_config ( const ::CCM_DDS_PSAT::SharedMemoryConfig & /*shared_memory_config */) { } - + virtual ::CCM_DDS_PSAT::BufferPoolConfig attach_buffer_config (void) { return ::CCM_DDS_PSAT::BufferPoolConfig (); } - + virtual void attach_buffer_config ( const ::CCM_DDS_PSAT::BufferPoolConfig & /* attach_buffer_config */) { } - + virtual ::CCM_DDS_PSAT::TransportConfig * transports_config (void) { return 0; } - + virtual void transports_config ( diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h index 02f5f71b52e..6da725df253 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h @@ -37,7 +37,7 @@ namespace CIAO_Reader_Test_Receiver_Impl Receiver_exec_i &callback_; }; - + //============================================================ // Starter_exec_i //============================================================ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h index 8fdcd027545..3c542fa2e49 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h @@ -29,7 +29,7 @@ namespace CIAO_Unkeyed_Test_Sender_Impl /// Handle the timeout. virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg); - + private: /// Maintains a handle that actually process the event Sender_exec_i &pulse_callback_; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h index 01cc54e03b9..8b0af585b5e 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h @@ -20,7 +20,7 @@ namespace CIAO_Writer_Sender_Impl { class Sender_exec_i; - + enum WRITER_ASSIGNMENT { WRITE_NONE, WRITE_UNKEYED, diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h index 2f7b0d528bb..9df51def025 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h @@ -31,10 +31,10 @@ namespace CIAO_Shapes_Sender_comp_Impl Controller_exec_i (Sender_exec_i &callback); virtual ~Controller_exec_i (void); - virtual ::Shapes::ReturnStatus + virtual ::Shapes::ReturnStatus setSize (::CORBA::UShort size); - virtual ::Shapes::ReturnStatus + virtual ::Shapes::ReturnStatus setLocation (::CORBA::UShort x, ::CORBA::UShort y); private: diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h index 904421ec63b..76a07ee4bb3 100644 --- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h +++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h @@ -44,7 +44,7 @@ namespace MyImpl private: CORBA::String_var str_; }; - + /** * @class BMClosedED_exec_i * diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h index c28c6f0393c..e1caa487239 100644 --- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h +++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h @@ -44,7 +44,7 @@ namespace MyImpl private: CORBA::String_var str_; }; - + /** * @class BMDEVICE_exec_i * diff --git a/CIAO/examples/BasicSP/EC/EC_exec.h b/CIAO/examples/BasicSP/EC/EC_exec.h index e42352971cd..958f462fd35 100644 --- a/CIAO/examples/BasicSP/EC/EC_exec.h +++ b/CIAO/examples/BasicSP/EC/EC_exec.h @@ -139,7 +139,7 @@ namespace MyImpl * EC home executor implementation class. */ class EC_EXEC_Export ECHome_exec_i : - public virtual ::CIAO_BasicSP_EC_Impl::ECHome_Exec, + public virtual ::CIAO_BasicSP_EC_Impl::ECHome_Exec, public virtual ::CORBA::LocalObject { public: diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.h b/CIAO/examples/Display/RateGen/RateGen_exec.h index 438cbfbde1b..dc98931ce97 100644 --- a/CIAO/examples/Display/RateGen/RateGen_exec.h +++ b/CIAO/examples/Display/RateGen/RateGen_exec.h @@ -74,7 +74,7 @@ namespace MyImpl * RateGen executor implementation class. */ class RATEGEN_EXEC_Export RateGen_exec_i : - public virtual ::CIAO_HUDisplay_RateGen_Impl::RateGen_Exec, + public virtual ::CIAO_HUDisplay_RateGen_Impl::RateGen_Exec, public virtual ::CORBA::LocalObject { public: diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.h b/CIAO/examples/Hello/Receiver/Receiver_exec.h index afe69e2f35c..c59b471ac9a 100644 --- a/CIAO/examples/Hello/Receiver/Receiver_exec.h +++ b/CIAO/examples/Hello/Receiver/Receiver_exec.h @@ -52,55 +52,55 @@ namespace CIAO_Hello_Receiver_Impl public: Receiver_exec_i (void); virtual ~Receiver_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual void push_click_in ( ::Hello::TimeOut * ev); - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::CORBA::Short iterations (void); - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void iterations ( ::CORBA::Short iterations); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::Hello::CCM_Receiver_Context_var context_; CORBA::String_var message_; CORBA::Short iterations_; }; - + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Hello_Receiver_Impl (void); } @@ -113,21 +113,21 @@ namespace CIAO_Hello_Receiver_Impl { public: ReceiverHome_exec_i (void); - + virtual ~ReceiverHome_exec_i (void); - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Hello_ReceiverHome_Impl (void); } diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h index ddef58132d4..7bc2211fd4d 100644 --- a/CIAO/examples/Hello/Sender/Sender_exec.h +++ b/CIAO/examples/Hello/Sender/Sender_exec.h @@ -49,7 +49,7 @@ namespace CIAO_Hello_Sender_Impl // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exh.cpp:58 - + class SENDER_EXEC_Export ReadMessage_exec_i : public virtual ::Hello::CCM_ReadMessage, public virtual ::CORBA::LocalObject @@ -58,19 +58,19 @@ namespace CIAO_Hello_Sender_Impl ReadMessage_exec_i (Sender_exec_i& component); virtual ~ReadMessage_exec_i (void); - + // Operations and attributes from ::Hello::ReadMessage - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual char * get_message (void); private: Sender_exec_i& component_; }; - + class SENDER_EXEC_Export Sender_exec_i : public virtual Sender_Exec, public virtual ::CORBA::LocalObject @@ -79,60 +79,60 @@ namespace CIAO_Hello_Sender_Impl Sender_exec_i (void); Sender_exec_i (const char* local_message); virtual ~Sender_exec_i (void); - + //@{ /** Supported operations and attributes. */ - - + + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void start (void); //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::Hello::CCM_ReadMessage_ptr get_push_message (void); - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual char * local_message (void); - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void local_message ( const char * local_message); - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::Hello::CCM_Sender_Context_var context_; CORBA::String_var message_; CORBA::Boolean log_time_; friend class ReadMessage_exec_i; }; - + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Hello_Sender_Impl (void); } @@ -145,21 +145,21 @@ namespace CIAO_Hello_Sender_Impl { public: SenderHome_exec_i (void); - + virtual ~SenderHome_exec_i (void); - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Hello_SenderHome_Impl (void); } diff --git a/CIAO/examples/Null_Component/Null_Component_exec.h b/CIAO/examples/Null_Component/Null_Component_exec.h index e280c472eed..442c837b833 100644 --- a/CIAO/examples/Null_Component/Null_Component_exec.h +++ b/CIAO/examples/Null_Component/Null_Component_exec.h @@ -47,7 +47,7 @@ namespace CIAO_Null_Component_Impl { // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exh.cpp:58 - + class NULL_COMPONENT_EXEC_Export Null_Interface_exec_i : public virtual ::CCM_Null_Interface, public virtual ::CORBA::LocalObject @@ -55,16 +55,16 @@ namespace CIAO_Null_Component_Impl public: Null_Interface_exec_i (void); virtual ~Null_Interface_exec_i (void); - + // Operations and attributes from ::Null_Interface - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void null_operation (void); }; - + class NULL_COMPONENT_EXEC_Export Null_Component_exec_i : public virtual Null_Component_Exec, public virtual ::CORBA::LocalObject @@ -72,39 +72,39 @@ namespace CIAO_Null_Component_Impl public: Null_Component_exec_i (void); virtual ~Null_Component_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::CCM_Null_Interface_ptr get_null_facet (void); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::CCM_Null_Component_Context_var context_; }; - + extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr create_Null_Component_Impl (void); } @@ -117,21 +117,21 @@ namespace CIAO_Null_Component_Impl { public: Null_ComponentHome_exec_i (void); - + virtual ~Null_ComponentHome_exec_i (void); - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr create_Null_ComponentHome_Impl (void); } diff --git a/CIAO/examples/Null_Component/plan.h b/CIAO/examples/Null_Component/plan.h index b6c5ada9ff2..6f29a6e2aab 100644 --- a/CIAO/examples/Null_Component/plan.h +++ b/CIAO/examples/Null_Component/plan.h @@ -23,7 +23,7 @@ struct HomeAttributes }; /// Homes -HomeAttributes homes_table[] = +HomeAttributes homes_table[] = { { "Null_Component.ComponentImplementations.Null_Assembly_Container." diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h index e280c472eed..442c837b833 100644 --- a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h +++ b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h @@ -47,7 +47,7 @@ namespace CIAO_Null_Component_Impl { // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exh.cpp:58 - + class NULL_COMPONENT_EXEC_Export Null_Interface_exec_i : public virtual ::CCM_Null_Interface, public virtual ::CORBA::LocalObject @@ -55,16 +55,16 @@ namespace CIAO_Null_Component_Impl public: Null_Interface_exec_i (void); virtual ~Null_Interface_exec_i (void); - + // Operations and attributes from ::Null_Interface - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void null_operation (void); }; - + class NULL_COMPONENT_EXEC_Export Null_Component_exec_i : public virtual Null_Component_Exec, public virtual ::CORBA::LocalObject @@ -72,39 +72,39 @@ namespace CIAO_Null_Component_Impl public: Null_Component_exec_i (void); virtual ~Null_Component_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::CCM_Null_Interface_ptr get_null_facet (void); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::CCM_Null_Component_Context_var context_; }; - + extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr create_Null_Component_Impl (void); } @@ -117,21 +117,21 @@ namespace CIAO_Null_Component_Impl { public: Null_ComponentHome_exec_i (void); - + virtual ~Null_ComponentHome_exec_i (void); - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr create_Null_ComponentHome_Impl (void); } diff --git a/CIAO/tests/Bug_3769_Regression/Foo_exec.h b/CIAO/tests/Bug_3769_Regression/Foo_exec.h index ca58516c204..88a468c63ea 100644 --- a/CIAO/tests/Bug_3769_Regression/Foo_exec.h +++ b/CIAO/tests/Bug_3769_Regression/Foo_exec.h @@ -22,129 +22,129 @@ namespace CIAO_Foo_Impl public: Foo_exec_i (void); virtual ~Foo_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::CORBA::Short my_short (void); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void my_short ( ::CORBA::Short my_short); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::CORBA::Long my_long (void); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void my_long ( ::CORBA::Long my_long); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::CORBA::Float my_float (void); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void my_float ( ::CORBA::Float my_float); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::CORBA::Double my_double (void); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void my_double ( ::CORBA::Double my_double); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::short_sequence * my_short_sequence (void); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void my_short_sequence ( const ::short_sequence & my_short_sequence); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::long_sequence * my_long_sequence (void); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void my_long_sequence ( const ::long_sequence & my_long_sequence); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::float_sequence * my_float_sequence (void); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void my_float_sequence ( const ::float_sequence & my_float_sequence); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::double_sequence * my_double_sequence (void); - + // TAO_IDL - Generated from // c:\middleware\ace_devo\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void my_double_sequence ( const ::double_sequence & my_double_sequence); - + virtual ::Bar my_bar_struct (void); - + virtual void my_bar_struct (const ::Bar & my_bar_struct); virtual ::Baz *my_baz_struct (void); - + virtual void my_baz_struct (const ::Baz & my_baz_struct); virtual ::Data my_data_union (void); - + virtual void my_data_union (const ::Data & my_data_union); virtual ::Data2* my_var_data_union (void); @@ -181,26 +181,26 @@ namespace CIAO_Foo_Impl virtual void my_string_array (const ::string_array my_string_array); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::CCM_Foo_Context_var context_; - - bool + + bool my_short_, my_long_, my_float_, @@ -214,9 +214,9 @@ namespace CIAO_Foo_Impl my_string_sequence_, my_fixed_string_, my_variable_string_; - + }; - + extern "C" FOO_EXEC_Export ::Components::EnterpriseComponent_ptr create_Foo_Impl (void); } diff --git a/CIAO/tests/Bug_3834_Regression/CompA_exec.h b/CIAO/tests/Bug_3834_Regression/CompA_exec.h index 9e8a8a63523..2bef0e4c289 100644 --- a/CIAO/tests/Bug_3834_Regression/CompA_exec.h +++ b/CIAO/tests/Bug_3834_Regression/CompA_exec.h @@ -46,7 +46,7 @@ namespace CIAO_CompA_Impl { // TAO_IDL - Generated from // be/be_visitor_component/facet_exh.cpp:53 - + class COMPA_EXEC_Export Moo_exec_i : public virtual ::CCM_Moo, public virtual ::CORBA::LocalObject @@ -54,16 +54,16 @@ namespace CIAO_CompA_Impl public: Moo_exec_i (void); virtual ~Moo_exec_i (void); - + // Operations and attributes from ::Moo - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 - + virtual void do_something (void); }; - + class COMPA_EXEC_Export CompA_exec_i : public virtual CompA_Exec, public virtual ::CORBA::LocalObject @@ -71,39 +71,39 @@ namespace CIAO_CompA_Impl public: CompA_exec_i (void); virtual ~CompA_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::CCM_Moo_ptr get_my_moo (void); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::CCM_CompA_Context_var context_; }; - + extern "C" COMPA_EXEC_Export ::Components::EnterpriseComponent_ptr create_CompA_Impl (void); } diff --git a/CIAO/tests/Bug_3834_Regression/CompB_exec.h b/CIAO/tests/Bug_3834_Regression/CompB_exec.h index 683713a06c1..8e3e30e3741 100644 --- a/CIAO/tests/Bug_3834_Regression/CompB_exec.h +++ b/CIAO/tests/Bug_3834_Regression/CompB_exec.h @@ -51,36 +51,36 @@ namespace CIAO_CompB_Impl public: CompB_exec_i (void); virtual ~CompB_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - + //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::CCM_CompB_Context_var context_; }; - + extern "C" COMPB_EXEC_Export ::Components::EnterpriseComponent_ptr create_CompB_Impl (void); } diff --git a/CIAO/tests/CIF/Component/CIF_Component_exec.h b/CIAO/tests/CIF/Component/CIF_Component_exec.h index 12eecda615f..595646ee2b3 100644 --- a/CIAO/tests/CIF/Component/CIF_Component_exec.h +++ b/CIAO/tests/CIF/Component/CIF_Component_exec.h @@ -42,7 +42,7 @@ namespace CIAO_CIF_CIF_Provider_Impl { - + // TAO_IDL - Generated from // be/be_visitor_component/facet_exh.cpp:53 class provide_cif_foo_exec_i @@ -53,16 +53,16 @@ namespace CIAO_CIF_CIF_Provider_Impl provide_cif_foo_exec_i ( ::CIF::CCM_CIF_Provider_Context_ptr ctx); virtual ~provide_cif_foo_exec_i (void); - + // Operations and attributes from ::CIF::foo - + virtual void do_foo (void); - + private: ::CIF::CCM_CIF_Provider_Context_var ciao_context_; }; - + // TAO_IDL - Generated from // be/be_visitor_component/facet_exh.cpp:53 class provide_cif_inherited_foo_exec_i @@ -73,19 +73,19 @@ namespace CIAO_CIF_CIF_Provider_Impl provide_cif_inherited_foo_exec_i ( ::CIF::CCM_CIF_Provider_Context_ptr ctx); virtual ~provide_cif_inherited_foo_exec_i (void); - + // Operations and attributes from ::CIF::inherited_foo - + virtual void do_inherited_foo (void); - + virtual void do_foo (void); - + private: ::CIF::CCM_CIF_Provider_Context_var ciao_context_; }; - + class CIF_Provider_exec_i : public virtual CIF_Provider_Exec, public virtual ::CORBA::LocalObject @@ -93,48 +93,48 @@ namespace CIAO_CIF_CIF_Provider_Impl public: CIF_Provider_exec_i (void); virtual ~CIF_Provider_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::CIF::CCM_foo_ptr get_provide_cif_foo (void); - + virtual ::CIF::CCM_inherited_foo_ptr get_provide_cif_inherited_foo (void); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context (::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - + private: ::CIF::CCM_CIF_Provider_Context_var ciao_context_; ::CIF::CCM_foo_var ciao_provide_cif_foo_; ::CIF::CCM_inherited_foo_var ciao_provide_cif_inherited_foo_; }; - + extern "C" CIF_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr create_CIF_CIF_Provider_Impl (void); } namespace CIAO_CIF_CIF_User_Impl { - + class CIF_User_exec_i : public virtual CIF_User_Exec, public virtual ::CORBA::LocalObject @@ -142,33 +142,33 @@ namespace CIAO_CIF_CIF_User_Impl public: CIF_User_exec_i (void); virtual ~CIF_User_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - + //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context (::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - + private: ::CIF::CCM_CIF_User_Context_var ciao_context_; }; - + extern "C" CIF_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr create_CIF_CIF_User_Impl (void); } diff --git a/CIAO/tests/DAnCE/Components/ProcessColocation_exec.h b/CIAO/tests/DAnCE/Components/ProcessColocation_exec.h index ed5e8d3d950..8dc2edb25e0 100644 --- a/CIAO/tests/DAnCE/Components/ProcessColocation_exec.h +++ b/CIAO/tests/DAnCE/Components/ProcessColocation_exec.h @@ -52,43 +52,43 @@ namespace CIAO_Simple_ProcessColocation_Impl public: ProcessColocation_exec_i (void); virtual ~ProcessColocation_exec_i (void); - + // Supported operations and attributes. - + // Component attributes. - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:46 - + virtual char * process_name (void); - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:46 - + virtual void process_name ( const char * process_name); - + // Port operations. - + // Operations from Components::SessionComponent. - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); - + private: ACE_CString process_name_; ::Simple::CCM_ProcessColocation_Context_var context_; }; - + extern "C" PROCESSCOLOCATION_EXEC_Export ::Components::EnterpriseComponent_ptr create_Simple_ProcessColocation_Impl (void); } @@ -101,21 +101,21 @@ namespace CIAO_Simple_ProcessColocation_Impl { public: ProcessColocationHome_exec_i (void); - + virtual ~ProcessColocationHome_exec_i (void); - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" PROCESSCOLOCATION_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_ProcessColocationHome_Impl (void); } diff --git a/CIAO/tests/DAnCE/Components/Progressive_exec.h b/CIAO/tests/DAnCE/Components/Progressive_exec.h index bb641913637..09c0fbc2a35 100644 --- a/CIAO/tests/DAnCE/Components/Progressive_exec.h +++ b/CIAO/tests/DAnCE/Components/Progressive_exec.h @@ -46,7 +46,7 @@ namespace CIAO_Simple_Progressive_Impl { // TAO_IDL - Generated from // be/be_visitor_component/facet_exh.cpp:53 - + class PROGRESSIVE_EXEC_Export Trigger_exec_i : public virtual ::Simple::CCM_Trigger, public virtual ::CORBA::LocalObject @@ -55,21 +55,21 @@ namespace CIAO_Simple_Progressive_Impl Trigger_exec_i (bool &, ::Simple::CCM_Progressive_Context_ptr); virtual ~Trigger_exec_i (void); - + // Operations and attributes from ::Simple::Trigger - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 - + virtual void hello ( const char * hello); - + private: bool &triggered_; ::Simple::CCM_Progressive_Context_ptr context_; }; - + class PROGRESSIVE_EXEC_Export Progressive_exec_i : public virtual Progressive_Exec, public virtual ::CORBA::LocalObject @@ -77,39 +77,39 @@ namespace CIAO_Simple_Progressive_Impl public: Progressive_exec_i (void); virtual ~Progressive_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::Simple::CCM_Trigger_ptr get_trig_in (void); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context (::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::Simple::CCM_Progressive_Context_var context_; bool triggered_; }; - + extern "C" PROGRESSIVE_EXEC_Export ::Components::EnterpriseComponent_ptr create_Simple_Progressive_Impl (void); } @@ -122,15 +122,15 @@ namespace CIAO_Simple_Progressive_Impl { public: ProgressiveHome_exec_i (void); - + virtual ~ProgressiveHome_exec_i (void); - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" PROGRESSIVE_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_ProgressiveHome_Impl (void); } diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h b/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h index 4daa42f989d..cc9c8cf5159 100644 --- a/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h +++ b/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.h @@ -29,7 +29,7 @@ namespace CIAO_Simple_SimpleLocalProvider_Impl virtual void hello ( const char * hello); - + private: bool &triggered_; }; diff --git a/CIAO/tests/DAnCE/Components/SimpleProvider_exec.h b/CIAO/tests/DAnCE/Components/SimpleProvider_exec.h index 1ffa389790f..41d8d531bfb 100644 --- a/CIAO/tests/DAnCE/Components/SimpleProvider_exec.h +++ b/CIAO/tests/DAnCE/Components/SimpleProvider_exec.h @@ -29,7 +29,7 @@ namespace CIAO_Simple_SimpleProvider_Impl virtual void hello ( const char * hello); - + private: bool &triggered_; }; diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h index ae45f5b3d32..a7f73de1ddf 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h +++ b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h @@ -30,25 +30,25 @@ namespace dance_test Exec_Dest_Status (void); ~Exec_Dest_Status (void); - + void plan (const ::Deployment::DeploymentPlan *plan); void destructor_called (const std::string &id); - + bool check_destructor (const std::string &id); private: - + struct Instance_Status { Instance_Status (void); - + bool destructor_; }; - + typedef std::map <std::string, Instance_Status> Inst_Map; Inst_Map instances_; }; - + typedef ACE_Singleton <Exec_Dest_Status, ACE_Null_Mutex> EXEC_DEST_STATUS; } diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h index b4493a76917..aa332936c05 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h +++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.h @@ -4,10 +4,10 @@ /** * @file Executor_Destructor_Interceptor.h * - * Base, no-op interceptor. + * Base, no-op interceptor. **/ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_codegen.cpp:1571 #ifndef EXEC_DEST_INT @@ -31,48 +31,48 @@ namespace DAnCE { /** * @class DAnCE_Executor_Destructor - * @brief Base, no-op interceptor implementation. + * @brief Base, no-op interceptor implementation. */ class Executor_Destructor_Interceptor_Export Executor_Destructor : public virtual ::DAnCE::DeploymentInterceptor_Base { public: - // Constructor + // Constructor Executor_Destructor (void); - - // Destructor + + // Destructor virtual ~Executor_Destructor (void); - + virtual void configure (const ::Deployment::Properties & config); - + virtual void preprocess_plan (::Deployment::DeploymentPlan & plan); - + virtual void pre_install (::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef); - + virtual void post_configured (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_activate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_passivate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_remove (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + private: std::set < std::string > instance_ids_; }; diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h index c0c71f8c67d..d75abc34ffc 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h +++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.h @@ -46,7 +46,7 @@ namespace CIAO_dance_test_Exec_Destructor_Impl { - + class EXECUTOR_DESTRUCTOR_EXEC_Export Exec_Destructor_exec_i : public virtual Exec_Destructor_Exec, public virtual ::CORBA::LocalObject @@ -54,37 +54,37 @@ namespace CIAO_dance_test_Exec_Destructor_Impl public: Exec_Destructor_exec_i (void); virtual ~Exec_Destructor_exec_i (void); - + //@{ /** Supported operations and attributes. */ void id (const char *); - + char * id (void) { return 0; } //@} - + //@{ /** Component attributes and port operations. */ - + //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context (::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - + private: ::dance_test::CCM_Exec_Destructor_Context_var ciao_context_; std::string name_; }; - + extern "C" EXECUTOR_DESTRUCTOR_EXEC_Export ::Components::EnterpriseComponent_ptr create_dance_test_Exec_Destructor_Impl (void); } @@ -97,22 +97,22 @@ namespace CIAO_dance_test_Exec_Destructor_Impl { public: Home_Destructor_exec_i (void); - + virtual ~Home_Destructor_exec_i (void); - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); void id (const char *); - + char * id (void); private: std::string name_; }; - + extern "C" EXECUTOR_DESTRUCTOR_EXEC_Export ::Components::HomeExecutorBase_ptr create_dance_test_Home_Destructor_Impl (void); } diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h index cf7e7fb87ba..d98965b903c 100644 --- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h +++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.h @@ -40,12 +40,12 @@ namespace CIAO_cpuaffinity_A_Impl virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); - + private: ::cpuaffinity::CCM_A_Context_var context_; CORBA::Long cpu_affinity_; }; - + extern "C" COMMANDLINEPASSAGE_EXEC_Export ::Components::EnterpriseComponent_ptr create_Component_Impl (void); } diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h index d8bcc90c430..b4052950655 100644 --- a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h +++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage_exec.h @@ -40,12 +40,12 @@ namespace CIAO_command_line_test_A_Impl virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); - + private: ::command_line_test::CCM_A_Context_var context_; CORBA::Long tc_max_; }; - + extern "C" COMMANDLINEPASSAGE_EXEC_Export ::Components::EnterpriseComponent_ptr create_Component_Impl (void); } diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h index 1bc37d980e8..609c56c9782 100644 --- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h +++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.h @@ -44,7 +44,7 @@ namespace CIAO_locality_Shutdown_Impl { - + class COMMANDLINEPASSAGE_EXEC_Export Shutdown_exec_i : public virtual Shutdown_Exec, public virtual ::CORBA::LocalObject @@ -52,33 +52,33 @@ namespace CIAO_locality_Shutdown_Impl public: Shutdown_exec_i (void); virtual ~Shutdown_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - + //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context (::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - + private: ::locality::CCM_Shutdown_Context_var ciao_context_; }; - + extern "C" COMMANDLINEPASSAGE_EXEC_Export ::Components::EnterpriseComponent_ptr create_locality_Shutdown_Impl (void); } diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h index 231b193da8c..b819f018224 100644 --- a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h +++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h @@ -19,7 +19,7 @@ namespace CIAO_connector_test_C_Impl { - class ComponentC_exec_i + class ComponentC_exec_i : public virtual C_Exec, public virtual ::CORBA::LocalObject { @@ -56,7 +56,7 @@ namespace CIAO_connector_test_C_Impl virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); - + private: ::connector_test::CCM_C_Context_var context_; CORBA::String_var topic_name_c_; @@ -66,7 +66,7 @@ namespace CIAO_connector_test_C_Impl bool topic_name_b_has_been_set_; bool topic_name_a_has_been_set_; }; - + extern "C" INHERITED_COMPONENTS_EXEC_Export ::Components::EnterpriseComponent_ptr create_ComponentC_Impl (void); } diff --git a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.h b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.h index a60906d3aa5..86e62422d4a 100644 --- a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.h +++ b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export_exec.h @@ -51,29 +51,29 @@ namespace CIAO_Foo_Impl public: Foo_exec_i (void); virtual ~Foo_exec_i (void); - + // Supported operations and attributes. - + // Component attributes. - + // Port operations. - + // Operations from Components::SessionComponent. - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); - + private: ::CCM_Foo_Context_var context_; }; - + extern "C" LEM_EXPORT_EXEC_Export ::Components::EnterpriseComponent_ptr create_Foo_Impl (void); } diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h index 63894ee2bf6..c9cdaebb5a3 100644 --- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h +++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h @@ -52,36 +52,36 @@ namespace CIAO_Minimum_Receiver_Impl public: Receiver_exec_i (void); virtual ~Receiver_exec_i (void); - + //@{ /** Supported operations and attributes. */ - + //@} - + //@{ /** Component attributes and port operations. */ - + //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::Minimum::CCM_Receiver_Context_var context_; }; - + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Minimum_Receiver_Impl (void); } @@ -94,21 +94,21 @@ namespace CIAO_Minimum_Receiver_Impl { public: ReceiverHome_exec_i (void); - + virtual ~ReceiverHome_exec_i (void); - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Minimum_ReceiverHome_Impl (void); } diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.h b/CIAO/tests/Minimum/Sender/Sender_exec.h index 6417056a566..babcc5c4194 100644 --- a/CIAO/tests/Minimum/Sender/Sender_exec.h +++ b/CIAO/tests/Minimum/Sender/Sender_exec.h @@ -52,42 +52,42 @@ namespace CIAO_Minimum_Sender_Impl public: Sender_exec_i (void); virtual ~Sender_exec_i (void); - + //@{ /** Supported operations and attributes. */ - - + + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void bar (void); //@} - + //@{ /** Component attributes and port operations. */ - + //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::Minimum::CCM_Sender_Context_var context_; }; - + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Minimum_Sender_Impl (void); } @@ -100,21 +100,21 @@ namespace CIAO_Minimum_Sender_Impl { public: SenderHome_exec_i (void); - + virtual ~SenderHome_exec_i (void); - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Minimum_SenderHome_Impl (void); } diff --git a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h index 7bda9a21555..5d442cb43a0 100644 --- a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h +++ b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h @@ -83,7 +83,7 @@ public: virtual int visit_typedef (AST_Typedef *node); virtual int visit_native (AST_Native *node); virtual int visit_param_holder (AST_Param_Holder *node); - + protected: void check_prefix (AST_Decl *d); void check_id_and_version (AST_Decl *d); @@ -96,13 +96,13 @@ protected: void gen_operation (AST_Operation *node); void gen_attribute (AST_Attribute *node); void gen_label_value (AST_UnionLabel *node); - + // Overrides allow common code for visit_scope(). virtual bool scope_skip_type (AST_Decl *d); - + // Used by derived visitors to avoid generating an empty IDL module. bool can_skip_module (AST_Module *m); - + // Used by derived visitors to check for special include handling. bool match_excluded_file (const char *raw_filename); @@ -110,7 +110,7 @@ protected: TAO_OutStream *os; AST_Type *disc_type_; ACE_CString port_prefix_; - + private: ACE_CString tmp_retval_; }; diff --git a/CIAO/tools/IDL3_to_IDL2/be_global.h b/CIAO/tools/IDL3_to_IDL2/be_global.h index 2f0f6fbc02f..b246164ce47 100644 --- a/CIAO/tools/IDL3_to_IDL2/be_global.h +++ b/CIAO/tools/IDL3_to_IDL2/be_global.h @@ -57,9 +57,9 @@ public: bool encapsulate_idl2 (void) const; ACE_CString & excluded_filenames (void); - + void set_excluded_filenames (const char *filenames); - + bool gen_copyright (void) const; //========================================= @@ -77,7 +77,7 @@ public: void destroy (void); // Cleanup. - + protected: bool gen_copyright_; // So it can be turned off in backends that inherit from this one. diff --git a/CIAO/tools/IDL3_to_IDL2/be_helper.h b/CIAO/tools/IDL3_to_IDL2/be_helper.h index 7fab4e04347..a28b60ec01d 100644 --- a/CIAO/tools/IDL3_to_IDL2/be_helper.h +++ b/CIAO/tools/IDL3_to_IDL2/be_helper.h @@ -121,7 +121,7 @@ public: void gen_ifndef_string (const char *fname, const char *prefix, const char *suffix); - + // =overloaded operators TAO_OutStream &operator<< (const char *str); diff --git a/CIAO/tools/IDL3_to_IDL2/checking_visitor.h b/CIAO/tools/IDL3_to_IDL2/checking_visitor.h index e2372efb61a..a6f8f1bb7f0 100644 --- a/CIAO/tools/IDL3_to_IDL2/checking_visitor.h +++ b/CIAO/tools/IDL3_to_IDL2/checking_visitor.h @@ -98,9 +98,9 @@ public: virtual int visit_typedef (AST_Typedef *node); virtual int visit_root (AST_Root *node); virtual int visit_native (AST_Native *node); - + bool is_idl3 (void) const; - + private: void remove_idl2_only_filename (ACE_CString filename); diff --git a/CIAO/tools/IDL3_to_IDL2/identifier_helper.h b/CIAO/tools/IDL3_to_IDL2/identifier_helper.h index a6a6fcc88df..ff318b8fd7b 100644 --- a/CIAO/tools/IDL3_to_IDL2/identifier_helper.h +++ b/CIAO/tools/IDL3_to_IDL2/identifier_helper.h @@ -43,10 +43,10 @@ struct TAO_IDL3_TO_IDL2_BE_Export IdentifierHelper // 2) removes the '_' escape character when the identifier is // part of another identifier such as in provides_XXX // 3) removes any '_cxx_' in generated IDL - - static Identifier * + + static Identifier * original_local_name (Identifier * local_name); - + // Removes '_cxx_ from segments of a scoped name, and optionally // de-escape the last segment, if it's to be appended to. static ACE_CString @@ -55,10 +55,10 @@ struct TAO_IDL3_TO_IDL2_BE_Export IdentifierHelper // Detects case-insensitive match with IDL keyword. static bool is_idl_keyword (Identifier * local_name); - + // Preserves the 'escape' (leading underscore) in a // generated identifier if necessary. - static ACE_CString + static ACE_CString try_escape (Identifier * local_name); }; diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h index 5edd1656f5f..e2198e7ceb3 100644 --- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h +++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h @@ -65,21 +65,21 @@ public: virtual int visit_finder (AST_Finder *node); virtual int visit_root (AST_Root *node); virtual int visit_param_holder(AST_Param_Holder *node); - + private: UTL_ScopedName *create_scoped_name (const char *prefix, const char *local_name, const char *suffix, AST_Decl *parent); - + void tranfer_scope_elements (AST_Home *src, AST_Interface &dst); - + /// We don't want to visit a porttype when its declaration is /// encountered but rather by navigating to it from an /// extended port or a mirror port. int visit_porttype_scope (AST_PortType *node); int visit_porttype_scope_mirror (AST_PortType *node); - + private: AST_Home *home_; }; diff --git a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h index 62e11c29517..d513df7b996 100644 --- a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h +++ b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h @@ -10,7 +10,7 @@ // idl3p_checking_visitor.h // // = DESCRIPTION -// Header file for visitor that checks modules for the +// Header file for visitor that checks modules for the // presence of declarations other than non-code-generating // IDL3+ constructs. Prevents the generation of illegal // empty modules in the *_IDL2 artifact. @@ -80,9 +80,9 @@ public: virtual int visit_typedef (AST_Typedef *node); virtual int visit_root (AST_Root *node); virtual int visit_native (AST_Native *node); - + bool needs_codegen (void) const; - + private: bool needs_codegen_; }; diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h index 18f3b6d8813..70e0da82eab 100644 --- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h +++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h @@ -108,7 +108,7 @@ namespace DAnCE virtual int visit_root (AST_Root *node); virtual int visit_native (AST_Native *node); virtual int visit_finder (AST_Finder *node); - + struct Error { Error (const ACE_CString &diag, AST_Decl *node = 0) diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h index f191728b08b..87ad7a9195a 100644 --- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h +++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h @@ -51,7 +51,7 @@ namespace CIAO_Stock_StockDistributor_Impl // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exh.cpp:58 - + class STOCKDISTRIBUTOR_EXEC_Export StockQuoter_exec_i : public virtual ::Stock::CCM_StockQuoter, public virtual ::CORBA::LocalObject @@ -60,12 +60,12 @@ namespace CIAO_Stock_StockDistributor_Impl StockQuoter_exec_i (StockDistributor_exec_i &distributor); virtual ~StockQuoter_exec_i (void); - + // Operations and attributes from ::Stock::StockQuoter - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::Stock::StockInfo * get_stock_info ( const char * stock_name); @@ -133,60 +133,60 @@ namespace CIAO_Stock_StockDistributor_Impl public: StockDistributor_exec_i (void); virtual ~StockDistributor_exec_i (void); - + //@{ /** Supported operations and attributes. */ - - + + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void start (void); - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void stop (void); //@} - + //@{ /** Component attributes and port operations. */ - - + + virtual ::Stock::CCM_StockQuoter_ptr get_push_quoter (void); - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual ::CORBA::Long rate (void); - + // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 - + virtual void rate ( ::CORBA::Long rate); //@} - + //@{ /** Operations from Components::SessionComponent. */ - + virtual void set_session_context ( ::Components::SessionContext_ptr ctx); - + virtual void configuration_complete (void); - + virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); //@} - - + + private: ::Stock::CCM_StockDistributor_Context_var context_; /// User defined members @@ -210,7 +210,7 @@ namespace CIAO_Stock_StockDistributor_Impl friend class StockQuoter_exec_i; }; - + extern "C" STOCKDISTRIBUTOR_EXEC_Export ::Components::EnterpriseComponent_ptr create_Stock_StockDistributor_Impl (void); } @@ -223,21 +223,21 @@ namespace CIAO_Stock_StockDistributor_Impl { public: StockDistributorHome_exec_i (void); - + virtual ~StockDistributorHome_exec_i (void); - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (void); }; - + extern "C" STOCKDISTRIBUTOR_EXEC_Export ::Components::HomeExecutorBase_ptr create_Stock_StockDistributorHome_Impl (void); } |