From 9b4ec33ae917de0308bb5cb9b664e705ac0abd0e Mon Sep 17 00:00:00 2001 From: parsons Date: Fri, 3 Dec 2010 19:35:24 +0000 Subject: ChangeLogTag: Fri Dec 3 19:33:25 UTC 2010 Jeff Parsons --- TAO/ChangeLog | 14 ++++++++++++ TAO/tests/IDL_Test/IDL_Test.mpc | 3 +++ TAO/tests/IDL_Test/array.idl | 12 ---------- TAO/tests/IDL_Test/array_anon_nested.idl | 38 ++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 12 deletions(-) create mode 100644 TAO/tests/IDL_Test/array_anon_nested.idl diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3911dcc9883..4543706743a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Fri Dec 3 19:33:25 UTC 2010 Jeff Parsons + + * tests/IDL_Test/array_anon_nested.idl: + + New file, containing an unusual IDL construct + removed from array.idl below, so it can have + the appropriate tao_idl options and avoid RTI + DDS IDL processing. + + * tests/IDL_Test/IDL_Test.mpc: + * tests/IDL_Test/array.idl: + + Changes corresponding to the above description. + Fri Dec 3 18:13:01 UTC 2010 Jeff Parsons * TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp: diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index 71142ad89c8..1e0ade1aa5f 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -53,6 +53,7 @@ project(*IDL): taoserver, messaging, gen_ostream { idlflags += -as enum_in_struct.idl array.idl + array_anon_nested.idl included.idl including.idl sequence.idl @@ -100,6 +101,8 @@ project(*DLL): taoidldefaults, taolib, messaging { anonymousS.cpp arrayC.cpp arrayS.cpp + array_anon_nestedC.cpp + array_anon_nestedS.cpp array_onlyA.cpp array_onlyC.cpp array_onlyS.cpp diff --git a/TAO/tests/IDL_Test/array.idl b/TAO/tests/IDL_Test/array.idl index 1f79aabf9ce..968058b7972 100644 --- a/TAO/tests/IDL_Test/array.idl +++ b/TAO/tests/IDL_Test/array.idl @@ -165,15 +165,3 @@ module bug_2126 }; }; -/// There was a problem generating the *_Forany -/// for the inner array. -typedef struct teststruct -{ - char b[4]; - - struct embeddedstruct - { - char a[4]; - } estruct; - -} tstruct; diff --git a/TAO/tests/IDL_Test/array_anon_nested.idl b/TAO/tests/IDL_Test/array_anon_nested.idl new file mode 100644 index 00000000000..2afc97d0569 --- /dev/null +++ b/TAO/tests/IDL_Test/array_anon_nested.idl @@ -0,0 +1,38 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO/tests/IDL_Test +// +// = FILENAME +// array_anon_nested.idl +// +// = DESCRIPTION +// This file contains examples of IDL code that has +// caused problems in the past for the TAO IDL +// compiler. This test is to make sure the problems +// stay fixed. +// +// = AUTHORS +// Jeff Parsons and TAO users. +// +// ============================================================================ + +/// There was a problem generating the *_Forany +/// for the inner array. This construct is in a separate +/// IDL file for two reasons - (1) to avoid the -GA +/// option, which does not work when there are constructs +/// that result in nested C++ classes, and (2) to avoid +/// the RTI DDS processor, which chokes on this unusual +/// IDL. +typedef struct teststruct +{ + char b[4]; + + struct embeddedstruct + { + char a[4]; + } estruct; + +} tstruct; -- cgit v1.2.1