diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-08-30 19:28:49 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-08-30 19:28:49 +0000 |
| commit | 7869721f8a16291326c56ecb444ad53439b65922 (patch) | |
| tree | 47f2446b38916d46fde11bfb9820c64750e12bbb | |
| parent | e45184221a070f696736e84362c1efc2b5c7d438 (diff) | |
| download | ATCD-7869721f8a16291326c56ecb444ad53439b65922.tar.gz | |
ChangeLogTag: Thu Aug 30 19:27:46 UTC 2012 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/IDL_Test/included.idl | 2 | ||||
| -rw-r--r-- | TAO/tests/IDL_Test/including.idl | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6b1e1d926a3..29dd6c404f3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Aug 30 19:27:46 UTC 2012 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tests/IDL_Test/included.idl: + * tests/IDL_Test/including.idl: + + Modified included interface name to avoid link error. + Thu Aug 30 19:11:45 UTC 2012 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/fe/fe_utils.cpp(FE_Utils::can_be_redefined): diff --git a/TAO/tests/IDL_Test/included.idl b/TAO/tests/IDL_Test/included.idl index 41e0b43929b..a8d969c49a0 100644 --- a/TAO/tests/IDL_Test/included.idl +++ b/TAO/tests/IDL_Test/included.idl @@ -87,7 +87,7 @@ module RootModule }; }; -interface AA +interface AAA { typedef long my_long_type; }; diff --git a/TAO/tests/IDL_Test/including.idl b/TAO/tests/IDL_Test/including.idl index b5591675015..865d66c879b 100644 --- a/TAO/tests/IDL_Test/including.idl +++ b/TAO/tests/IDL_Test/including.idl @@ -115,11 +115,11 @@ module RootModule }; }; -interface AA; +interface AAA; interface B { - typedef AA::my_long_type my_b_long; + typedef AAA::my_long_type my_b_long; }; #endif /* IDL_TEST_INCLUDING_IDL */ |