diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-05 14:46:07 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-05 14:46:07 +0000 |
| commit | 61a0dea935cacab5b2ecee2499c63a47acb7621a (patch) | |
| tree | a0b7c54300037fef6820361476f7b85c32b3d48d | |
| parent | 05d1711e4f70cfeecbf1f5799eeb44bb6bbb56df (diff) | |
| download | ATCD-61a0dea935cacab5b2ecee2499c63a47acb7621a.tar.gz | |
Mon Mar 5 14:45:32 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 22 | ||||
| -rw-r--r-- | TAO/tests/IDL_Test/IDL_Test.mpc | 2 | ||||
| -rw-r--r-- | TAO/tests/IDL_Test/valuetype.idl | 26 |
3 files changed, 49 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 99de832338c..9c6e1650dd9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,25 @@ +Mon Mar 5 14:45:32 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/IDL_Test/valuetype.idl: + Added Recursive2 and Recursive3 types, both do result in + an invalid generated typecode. The generated code does compile + but will result in a crash when used runtime. + + * tests/IDL_Test/IDL_Test.mpc: + Don't use -GA for valuetype anymore, is too complex + +Mon Mar 5 13:41:32 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Any/Recursive/Test.idl: + Added RecursiveUnion2 as another test + + * tests/Any/Recursive/client.cpp: + Added call with RecursiveUnion2, also fails + + * tests/IDL_Test/union.idl: + * tests/IDL_Test/valuetype.idl + Some more tests + Mon Mar 5 11:09:32 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/AnyTypeCode/Recursive_Type_TypeCode.cpp: diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index c9edfb66edc..3675bfb9c29 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -7,6 +7,7 @@ project(*Main): taoserver, messaging { IDL_Files { idlflags += -GC -GH -Gd -GT array.idl + valuetype.idl Bug_2350_Regression.idl Bug_2577_Regression.idl Bug_2582_Regression.idl @@ -40,7 +41,6 @@ project(*Main): taoserver, messaging { pragma.idl repo_id_mod.idl typedef.idl - valuetype.idl array_only.idl typecode.idl } diff --git a/TAO/tests/IDL_Test/valuetype.idl b/TAO/tests/IDL_Test/valuetype.idl index 7a53a52193c..206422bc594 100644 --- a/TAO/tests/IDL_Test/valuetype.idl +++ b/TAO/tests/IDL_Test/valuetype.idl @@ -62,4 +62,30 @@ valuetype GetsDeprecatedMember : IncludedBase public string StringMember; }; +valuetype Recursive2; +typedef sequence<Recursive2> Recursive2Seq2; + +valuetype Recursive2 +{ + public struct Innerstruct3a + { + Recursive2Seq2 recursive_unions; + } insa; + public short a; + public struct Innerstruct3b + { + Recursive2Seq2 recursive_second; + } insb; +}; + +valuetype Recursive3; +typedef sequence<Recursive3> RecursiveSeq3; + +valuetype Recursive3 +{ + public RecursiveSeq3 seq1; + public short a; + public RecursiveSeq3 seq2; +}; + #endif /* IDL_TEST_VALUETYPE_IDL */ |