diff options
| author | msmit <msmit@remedy.nl> | 2011-11-24 07:41:25 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2011-11-24 07:41:25 +0000 |
| commit | ddf04986eb1b7fe10ef1381293281a056ce5633b (patch) | |
| tree | 6553dbf07d5ac088c0a0a4552edafdedf1668ad7 | |
| parent | d57213b4719a19ddea615d8bd83ec92c8696ffc9 (diff) | |
| download | ATCD-ddf04986eb1b7fe10ef1381293281a056ce5633b.tar.gz | |
Thu Nov 24 07:40:14 UTC 2011 Marcel Smit <msmit@remedy.nl>
* tests/IDL_Test/Inherited_Servants/Base.idl:
* tests/IDL_Test/Inherited_Servants/Derived.idl:
Enabled all IDL code again and added an extra component
and interface without a module.
| -rw-r--r-- | CIAO/ChangeLog.BRANCH | 7 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Inherited_Servants/Base.idl | 6 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl | 54 |
3 files changed, 44 insertions, 23 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH index ace977dff9a..a8d267a336c 100644 --- a/CIAO/ChangeLog.BRANCH +++ b/CIAO/ChangeLog.BRANCH @@ -1,3 +1,10 @@ +Thu Nov 24 07:40:14 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/IDL_Test/Inherited_Servants/Base.idl: + * tests/IDL_Test/Inherited_Servants/Derived.idl: + Enabled all IDL code again and added an extra component + and interface without a module. + Fri Nov 4 15:47:29 UTC 2011 Marcel Smit <msmit@remedy.nl> * *.mpc: diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl b/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl index 1a4abf90456..6e570086ee9 100644 --- a/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl +++ b/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl @@ -19,9 +19,9 @@ module Inherited { component Base_comp { -// provides Inherited::base_interface prov_base; -// uses Inherited::base_interface uses_base; -// attribute long base; + provides Inherited::base_interface prov_base; + uses Inherited::base_interface uses_base; + attribute long base; }; }; diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl index 48f26993e8f..831af3282ff 100644 --- a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl +++ b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl @@ -12,40 +12,54 @@ module Inherited { interface derived_interface { - void do_derived (); -// readonly attribute string str_derived_interface; + void do_derived (); + readonly attribute string str_derived_interface; }; interface derived_2_interface : derived_interface { - void do_derived_2 (); -// readonly attribute string str_derived_interface_2; + void do_derived_2 (); + readonly attribute string str_derived_interface_2; }; -// interface Tester -// { -// void set_long_base (in long base); -// long get_long_base (); -// -// void set_long_derived (in long derived); -// long get_long_derived (); -// }; + interface Tester + { + void set_long_base (in long base); + long get_long_base (); + + void set_long_derived (in long derived); + long get_long_derived (); + }; component Derived_comp : Inherited::Base_comp -// supports Inherited::Tester + supports Inherited::Tester { - provides Inherited::derived_interface prov_derived; - uses Inherited::derived_interface uses_derived; + provides Inherited::derived_interface prov_derived; + uses Inherited::derived_interface uses_derived; -// attribute long derived; + attribute long derived; }; component Derived_2_comp : Inherited::Derived_comp { - provides Inherited::derived_2_interface prov_derived_2; - uses Inherited::derived_2_interface uses_derived_2; + provides Inherited::derived_2_interface prov_derived_2; + uses Inherited::derived_2_interface uses_derived_2; -// attribute long derived_2; + attribute long derived_2; }; }; -#endif +// Without a module +interface derived_3_interface : Inherited::derived_interface { + void do_derived_3 (); + readonly attribute string str_derived_interface_3; +}; + +component Derived_3_comp : Inherited::Derived_comp +{ + provides derived_3_interface prov_derived_3; + uses derived_3_interface uses_derived_3; + + attribute long derived_3; +}; + +#endif /* DERIVED_IDL */ |