summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tests/IDL_Test/nested_scope.idl8
2 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b63895407dc..453603be73e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 5 13:23:04 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tests/IDL_Test/nested_scope.idl:
+
+ Commented out a line that has been determined by Simon Massey
+ <simon dot massey at prismtech dot com> to be melformed IDL.
+
Mon Jun 4 22:40:13 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:
diff --git a/TAO/tests/IDL_Test/nested_scope.idl b/TAO/tests/IDL_Test/nested_scope.idl
index b36ce32cdb1..1793bbc1e34 100644
--- a/TAO/tests/IDL_Test/nested_scope.idl
+++ b/TAO/tests/IDL_Test/nested_scope.idl
@@ -168,7 +168,13 @@ module Wow
{
interface MyInterface
{
- void op1 (in bug_2125::Bar::Stuff fbs);
+// @@ (JP 06/04/07) I'm commenting out the line below, since
+// according to IDL scoping rules (CORBA 3.0.3, sections
+// 3.20.1 and 3.20.2), the module Wow::bug_2125 hides the
+// global module bug_2125 and so the lookup should fail.
+// Not removing the line completely in case someday we
+// extend IDL_Test to check for rejection of illegal IDL.
+// void op1 (in bug_2125::Bar::Stuff fbs);
void op2 (in ::bug_2125::Bar::Stuff fbs);
};
};