ChangeLogTag: Wed Dec 1 13:53:59 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 31 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 94d5059e3df..4951e6fc1da 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Wed Dec  1 13:53:59 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/anonymous.idl:
+        * tests/IDL_Tests/array.idl:
+
+          Moved some recently added IDL from anonymous.idl, where
+          a struct-in-struct declaration made it incompatible with
+          the -GA option used on that file, to array.idl, where -GA
+          is not used, and where the problem uncovered by the IDL
+          (non-generation of an Array_Traits<> instantiation for
+          an anonymous array in the nested struct) is more
+          appropriately tested anyway. It is a known issue that a
+          type declaration inside an interface, valuetype, component,
+          home, struct or union is not compatible with the -GA
+          option, since these container types can't be reopened in
+          the *A.h file (created by the option) to declare the
+          typecode in the proper scope.
+
 Wed Dec  1 12:09:31 UTC 2010  Martin Corino  <corino_m@remedy.nl>
 
         * TAO_IDL/be/be_visitor_component.cpp:
diff --git a/TAO/tests/IDL_Test/anonymous.idl b/TAO/tests/IDL_Test/anonymous.idl
index 044c76efb34..70ef3732b3b 100644
--- a/TAO/tests/IDL_Test/anonymous.idl
+++ b/TAO/tests/IDL_Test/anonymous.idl
@@ -73,15 +73,3 @@ module Second
   typedef string<32> SecondString;
 };
 
-/// 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.idl b/TAO/tests/IDL_Test/array.idl
index ff24c1b7c74..1f79aabf9ce 100644
--- a/TAO/tests/IDL_Test/array.idl
+++ b/TAO/tests/IDL_Test/array.idl
@@ -164,3 +164,16 @@ module bug_2126
     case FALSE: long wibble;
   };
 };
+
+/// There was a problem generating the *_Forany
+/// for the inner array.
+typedef struct teststruct
+{
+  char b[4];
+
+  struct embeddedstruct
+  {
+    char a[4];
+  } estruct;
+
+} tstruct;