summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-12-27 13:59:28 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-12-27 13:59:28 +0000
commit8ad3284cdfa857a0d0be3afa805fb84fb64e6fa8 (patch)
treedf3a63174b1ed007cf3aa91f56cb308c454b46df
parentc69f463ccb0dcc5bd2fad57aafd1821d1e0cd825 (diff)
downloadATCD-8ad3284cdfa857a0d0be3afa805fb84fb64e6fa8.tar.gz
ChangeLogTag: Fri Dec 27 07:56:31 2002 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog14
-rw-r--r--TAO/TAO_IDL/be/be_generator.cpp1
2 files changed, 15 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bef87fb1cd9..f0bba644bf4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Fri Dec 27 07:56:31 2002 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/be/be_generator.cpp (create_module):
+
+ Added a line to propagate the prefix of a module to a reopening of
+ that module in another IDL file, overlooked in the changes of
+
+ Wed Dec 11 18:26:09 2002 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ which was causing a reference (in a third IDL file) to a member of
+ the reopened module to lack the correct prefix, if it had been set.
+ Thanks to Nanbor Wang <nanbor@cse.wustl.edu> for reporting the
+ problem.
+
Fri Dec 27 07:15:34 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* examples/Simple/Simple_Util.h: Somehow missed this in my checkin.
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index cab9504fbb4..bb673eb5f77 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -164,6 +164,7 @@ be_generator::create_module (UTL_Scope *s,
// Get m's previous_ member, plus all it's decls,
// into the new modules's previous_ member.
retval->add_to_previous (m);
+ retval->prefix (ACE_const_cast (char *, m->prefix ()));
}
}
}