diff options
author | msmit <msmit@remedy.nl> | 2010-10-22 07:07:33 +0000 |
---|---|---|
committer | msmit <msmit@remedy.nl> | 2010-10-22 07:07:33 +0000 |
commit | 23b02f876a384250006ea05e805856527c863c8d (patch) | |
tree | 1498f0c044ac11f367369ff0d862e75faf09c0c5 | |
parent | 041b94fd62be304c3a5250dd4ac6ecaf9a181b53 (diff) | |
download | ATCD-23b02f876a384250006ea05e805856527c863c8d.tar.gz |
Fri Oct 22 07:12:29 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h:
* connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp:
* connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h:
* connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp:
* connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h:
* connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp:
Regenerated with the latest version of the IDL compiler.
7 files changed, 71 insertions, 107 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 7afe6d64e65..785d29c73b0 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Oct 22 07:12:29 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp: + Regenerated with the latest version of the IDL compiler. + Fri Oct 22 06:25:27 UTC 2010 Marcel Smit <msmit@remedy.nl> * tests/Bug_3890_Regression/Foo.idl: diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp index 6868eb07292..6fe4d21cded 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp @@ -75,76 +75,66 @@ namespace CIAO_Shapes_Control_comp_Impl ::CORBA::ULong Control_comp_exec_i::rate (void) { - return - this->rate_; + return this->rate_; } void Control_comp_exec_i::rate ( const ::CORBA::ULong rate) { - this->rate_ = - rate; + this->rate_ = rate; } ::CORBA::UShort Control_comp_exec_i::max_x (void) { - return - this->max_x_; + return this->max_x_; } void Control_comp_exec_i::max_x ( const ::CORBA::UShort max_x) { - this->max_x_ = - max_x; + this->max_x_ = max_x; } ::CORBA::UShort Control_comp_exec_i::max_y (void) { - return - this->max_y_; + return this->max_y_; } void Control_comp_exec_i::max_y ( const ::CORBA::UShort max_y) { - this->max_y_ = - max_y; + this->max_y_ = max_y; } ::CORBA::UShort Control_comp_exec_i::max_size (void) { - return - this->max_size_; + return this->max_size_; } void Control_comp_exec_i::max_size ( const ::CORBA::UShort max_size) { - this->max_size_ = - max_size; + this->max_size_ = max_size; } ::CORBA::Boolean Control_comp_exec_i::resize_shape (void) { - return - this->resize_shape_; + return this->resize_shape_; } void Control_comp_exec_i::resize_shape ( const ::CORBA::Boolean resize_shape) { - this->resize_shape_ = - resize_shape; + this->resize_shape_ = resize_shape; } // Operations from Components::SessionComponent. diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h index d814d350774..b5ba2247b1c 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.h @@ -24,8 +24,8 @@ * Information about TAO is available at: * http://www.cs.wustl.edu/~schmidt/TAO.html **/ -#ifndef CIAO__________TUTORIAL_CODE_SHAPES_CONTROL_COMP_SHAPES_CONTROL_COMP_EXEC_CUJIE3_H_ -#define CIAO__________TUTORIAL_CODE_SHAPES_CONTROL_COMP_SHAPES_CONTROL_COMP_EXEC_CUJIE3_H_ +#ifndef CIAO__________TUTORIAL_CODE_SHAPES_CONTROL_COMP_SHAPES_CONTROL_COMP_EXEC_MIMZ3T_H_ +#define CIAO__________TUTORIAL_CODE_SHAPES_CONTROL_COMP_SHAPES_CONTROL_COMP_EXEC_MIMZ3T_H_ #include /**/ "ace/pre.h" @@ -55,42 +55,26 @@ namespace CIAO_Shapes_Control_comp_Impl //@{ /** Component attributes and port operations. */ - - virtual ::CORBA::ULong - rate (void); - - virtual void - rate ( - ::CORBA::ULong rate); - - virtual ::CORBA::UShort - max_x (void); - - virtual void - max_x ( - ::CORBA::UShort max_x); - - virtual ::CORBA::UShort - max_y (void); - - virtual void - max_y ( - ::CORBA::UShort max_y); - - virtual ::CORBA::UShort - max_size (void); - - virtual void - max_size ( - ::CORBA::UShort max_size); - - virtual ::CORBA::Boolean - resize_shape (void); - - virtual void - resize_shape ( - ::CORBA::Boolean resize_shape); - //@} + + virtual ::CORBA::ULong rate (void); + + virtual void rate (::CORBA::ULong rate); + + virtual ::CORBA::UShort max_x (void); + + virtual void max_x (::CORBA::UShort max_x); + + virtual ::CORBA::UShort max_y (void); + + virtual void max_y (::CORBA::UShort max_y); + + virtual ::CORBA::UShort max_size (void); + + virtual void max_size (::CORBA::UShort max_size); + + virtual ::CORBA::Boolean resize_shape (void); + + virtual void resize_shape (::CORBA::Boolean resize_shape);//@} //@{ /** Operations from Components::SessionComponent. */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp index 45409a8ef5d..2763badf9f6 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp @@ -48,17 +48,15 @@ namespace CIAO_Shapes_Receiver_comp_Impl // Operations from ::Shapes::ShapeType_conn::Listener void - info_out_data_listener_exec_i::on_one_data ( - const ::ShapeType & /* datum */, - const ::CCM_DDS::ReadInfo & /* info */) + info_out_data_listener_exec_i::on_one_data (const ::ShapeType & /* datum */, + const ::CCM_DDS::ReadInfo & /* info */) { /* Your code here. */ } void - info_out_data_listener_exec_i::on_many_data ( - const ::Shapes::ShapeTypeSeq & /* data */, - const ::CCM_DDS::ReadInfoSeq & /* infos */) + info_out_data_listener_exec_i::on_many_data (const ::Shapes::ShapeTypeSeq & /* data */, + const ::CCM_DDS::ReadInfoSeq & /* infos */) { /* Your code here. */ } @@ -81,17 +79,15 @@ namespace CIAO_Shapes_Receiver_comp_Impl // Operations from ::CCM_DDS::PortStatusListener void - info_out_status_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) + info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) { /* Your code here. */ } void - info_out_status_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) + info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) { /* Your code here. */ } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h index 7e0e7ebb886..862ff3884f7 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h @@ -24,8 +24,8 @@ * Information about TAO is available at: * http://www.cs.wustl.edu/~schmidt/TAO.html **/ -#ifndef CIAO__________TUTORIAL_CODE_SHAPES_RECEIVER_COMP_SHAPES_RECEIVER_COMP_EXEC_KIL1IM_H_ -#define CIAO__________TUTORIAL_CODE_SHAPES_RECEIVER_COMP_SHAPES_RECEIVER_COMP_EXEC_KIL1IM_H_ +#ifndef CIAO__________TUTORIAL_CODE_SHAPES_RECEIVER_COMP_SHAPES_RECEIVER_COMP_EXEC_GYBLIT_H_ +#define CIAO__________TUTORIAL_CODE_SHAPES_RECEIVER_COMP_SHAPES_RECEIVER_COMP_EXEC_GYBLIT_H_ #include /**/ "ace/pre.h" @@ -52,21 +52,17 @@ namespace CIAO_Shapes_Receiver_comp_Impl // Operations and attributes from ::Shapes::ShapeType_conn::Listener virtual - void on_one_data ( - const ::ShapeType & datum, - const ::CCM_DDS::ReadInfo & info); + void on_one_data (const ::ShapeType & datum, + const ::CCM_DDS::ReadInfo & info); virtual - void on_many_data ( - const ::Shapes::ShapeTypeSeq & data, - const ::CCM_DDS::ReadInfoSeq & infos); + void on_many_data (const ::Shapes::ShapeTypeSeq & data, + const ::CCM_DDS::ReadInfoSeq & infos); private: ::Shapes::CCM_Receiver_comp_Context_var ciao_context_; }; - - class info_out_status_exec_i : public virtual ::CCM_DDS::CCM_PortStatusListener, public virtual ::CORBA::LocalObject @@ -79,21 +75,17 @@ namespace CIAO_Shapes_Receiver_comp_Impl // Operations and attributes from ::CCM_DDS::PortStatusListener virtual - void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); + void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); virtual - void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); + void on_sample_lost (::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); private: ::Shapes::CCM_Receiver_comp_Context_var ciao_context_; }; - - class Receiver_comp_exec_i : public virtual Receiver_comp_Exec, public virtual ::CORBA::LocalObject @@ -114,8 +106,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - //@} + get_info_out_status (void);//@} //@{ /** Operations from Components::SessionComponent. */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp index d4fba762152..7bf08f1778f 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp @@ -48,22 +48,20 @@ namespace CIAO_Shapes_Sender_comp_Impl // Operations from ::Shapes::Control_obj ::Shapes::ReturnStatus - control_exec_i::setSize ( - ::CORBA::UShort /* size */) + control_exec_i::setSize (::CORBA::UShort /* size */) { /* Your code here. */ return static_cast< ::Shapes::ReturnStatus> (0UL); } ::Shapes::ReturnStatus - control_exec_i::setLocation ( - ::CORBA::UShort /* x */, - ::CORBA::UShort /* y */) + control_exec_i::setLocation (::CORBA::UShort /* x */, + ::CORBA::UShort /* y */) { /* Your code here. */ return static_cast< ::Shapes::ReturnStatus> (0UL); } - + //============================================================ // Component Executor Implementation Class: Sender_comp_exec_i diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h index ffb2f7b7f48..363d13be342 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h @@ -24,8 +24,8 @@ * Information about TAO is available at: * http://www.cs.wustl.edu/~schmidt/TAO.html **/ -#ifndef CIAO__________TUTORIAL_CODE_SHAPES_SENDER_COMP_SHAPES_SENDER_COMP_EXEC_WFXNF1_H_ -#define CIAO__________TUTORIAL_CODE_SHAPES_SENDER_COMP_SHAPES_SENDER_COMP_EXEC_WFXNF1_H_ +#ifndef CIAO__________TUTORIAL_CODE_SHAPES_SENDER_COMP_SHAPES_SENDER_COMP_EXEC_HPZOAE_H_ +#define CIAO__________TUTORIAL_CODE_SHAPES_SENDER_COMP_SHAPES_SENDER_COMP_EXEC_HPZOAE_H_ #include /**/ "ace/pre.h" @@ -52,20 +52,16 @@ namespace CIAO_Shapes_Sender_comp_Impl // Operations and attributes from ::Shapes::Control_obj virtual - ::Shapes::ReturnStatus setSize ( - ::CORBA::UShort size); + ::Shapes::ReturnStatus setSize (::CORBA::UShort size); virtual - ::Shapes::ReturnStatus setLocation ( - ::CORBA::UShort x, - ::CORBA::UShort y); + ::Shapes::ReturnStatus setLocation (::CORBA::UShort x, + ::CORBA::UShort y); private: ::Shapes::CCM_Sender_comp_Context_var ciao_context_; }; - - class Sender_comp_exec_i : public virtual Sender_comp_Exec, public virtual ::CORBA::LocalObject @@ -83,8 +79,7 @@ namespace CIAO_Shapes_Sender_comp_Impl /** Component attributes and port operations. */ virtual ::Shapes::CCM_Control_obj_ptr - get_control (void); - //@} + get_control (void);//@} //@{ /** Operations from Components::SessionComponent. */ |