summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-27 20:19:40 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-27 20:19:40 +0000
commit7febdafe7c6a5c75737fb8af2ef785ea76873e69 (patch)
treea235ecc95135a914d534d9997f464d354bb7361d
parent4ae3330efbd10f06c12cfb326c9c5646e733ae2f (diff)
downloadATCD-7febdafe7c6a5c75737fb8af2ef785ea76873e69.tar.gz
ChangeLogTag: ue May 27 15:17:31 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp12
2 files changed, 14 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3c96873b67f..7433575c771 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue May 27 15:17:31 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+
+ Removed initialization of collocation proxy broker pointer
+ from the constructor of an abstract interface, since
+ abstract interfaces do not contain such a member.
+
Tue May 27 14:43:09 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* tao/DynamicAny/DynCommon.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index 40a0330d1fa..e16b93fe7b5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -86,12 +86,12 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
<< "TAO_Abstract_ServantBase *servant," << be_nl
<< "TAO_ORB_Core *orb_core" << be_uidt_nl
<< ")" << be_nl
- << ": ACE_NESTED_CLASS (CORBA, AbstractBase) (" << be_nl
- << " objref," << be_nl
- << " _tao_collocated," << be_nl
- << " servant" << be_nl
- << " )," << be_uidt_nl
- << "the"<< node->base_proxy_broker_name () << "_ (0)" << be_uidt_nl
+ << ": ACE_NESTED_CLASS (CORBA, AbstractBase) ("
+ << be_idt << be_idt << be_idt_nl
+ << "objref," << be_nl
+ << "_tao_collocated," << be_nl
+ << "servant" << be_uidt_nl
+ << ")" << be_uidt << be_uidt << be_uidt_nl
<< "{}";
}
else