diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-01-15 15:57:50 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-01-15 15:57:50 +0000 |
| commit | 5254dcc119f1b055e538fda38069e0eae2c6d2e9 (patch) | |
| tree | 097db90db3ab88376de9e71848dd53c3ceeedde1 | |
| parent | 88e3834eacf8ecc1ce17efb61204c4165eedcf98 (diff) | |
| download | ATCD-5254dcc119f1b055e538fda38069e0eae2c6d2e9.tar.gz | |
ChangeLogTag: Fri Jan 15 15:31:56 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | modules/TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | modules/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp | 2 | ||||
| -rw-r--r-- | modules/TAO/tests/IDL_Test/IDL_Test.mpc | 2 | ||||
| -rw-r--r-- | modules/TAO/tests/IDL_Test/valuetype.idl | 17 |
4 files changed, 32 insertions, 2 deletions
diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog index 0879cbb90b8..a082abcf467 100644 --- a/modules/TAO/ChangeLog +++ b/modules/TAO/ChangeLog @@ -1,3 +1,16 @@ +Fri Jan 15 15:31:56 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + + Reverted a small change made yesterday where the + generation of a double colon was prefixed to a name + that is not global. + + * tests/IDL_Test/valuetype.idl: + + Added an example to test the fix above, submitted by + Johnny Willemesen <jwillemsen@remedy.nl. + Thu Jan 14 22:50:03 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/include/ast_module.h: diff --git a/modules/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/modules/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 9abdc784085..3c87b11f6f6 100644 --- a/modules/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/modules/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -109,7 +109,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) } // Dump the scoped name. - *os << "public virtual ::"; + *os << "public virtual "; *os << inherited->nested_type_name (scope); } // end of for loop } diff --git a/modules/TAO/tests/IDL_Test/IDL_Test.mpc b/modules/TAO/tests/IDL_Test/IDL_Test.mpc index 2897cdc2975..ed5948dc4aa 100644 --- a/modules/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/modules/TAO/tests/IDL_Test/IDL_Test.mpc @@ -189,7 +189,7 @@ project(*Main): taoserver, messaging, gen_ostream { valuetypeC.cpp valuetypeS.cpp } - + Template_Files { *S_T.cpp } diff --git a/modules/TAO/tests/IDL_Test/valuetype.idl b/modules/TAO/tests/IDL_Test/valuetype.idl index d686a0726af..80a448aec01 100644 --- a/modules/TAO/tests/IDL_Test/valuetype.idl +++ b/modules/TAO/tests/IDL_Test/valuetype.idl @@ -63,4 +63,21 @@ valuetype GetsDeprecatedMember : IncludedBase public string StringMember; }; +// Tests the generation of the base valuetype's +// name, which is not a full name but relative +// to the scope it's in. +module X +{ + abstract valuetype AXXX + { + Object make_object (); + }; + + abstract valuetype BXXX : AXXX + { + }; + + typedef sequence<BXXX> BSeq; +}; + #endif /* IDL_TEST_VALUETYPE_IDL */ |