summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-01-24 15:08:02 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-01-24 15:08:02 +0000
commit22302ce929cc48e844be0442b6310b4a56f0b9c9 (patch)
tree5e3be9cbc8c23e5d0ce886c914a37913bdcdf75b
parentd574377fcd7e087332de89cbdcc916882785882d (diff)
downloadATCD-22302ce929cc48e844be0442b6310b4a56f0b9c9.tar.gz
ChangeLogTag: Fri Jan 24 09:04:28 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/TAO_IDL/fe/fe_interface_header.cpp21
2 files changed, 8 insertions, 21 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 320b71b0907..bda2c38f07b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jan 24 09:04:28 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/fe/fe_interface_header.cpp:
+
+ Fixed a bug in error-checking the inheritance of abstract
+ interfaces. Thanks to Michael Soden <soden@ikv.de> for
+ reporting the IDL compiler's incorrect error message.
+
Fri Jan 24 08:23:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp:
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 25e05f3110f..567f3174011 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -264,27 +264,6 @@ FE_InterfaceHeader::FE_InterfaceHeader (UTL_ScopedName *n,
this->compile_inheritance (inherits,
I_FALSE);
}
-
- int abstract_parent_seen = 0;
-
- if (this->pd_n_inherits > 0)
- {
- AST_Interface *iface = 0;
-
- for (long i = 0; i < this->pd_n_inherits; ++i)
- {
- iface = this->pd_inherits[i];
-
- if (iface->is_abstract ())
- {
- abstract_parent_seen = 1;
- }
- else if (abstract_parent_seen == 1)
- {
- idl_global->err ()->abstract_expected (iface);
- }
- }
- }
}
FE_InterfaceHeader::~FE_InterfaceHeader (void)