diff options
| author | Mumit Khan <khan@xraylith.wisc.edu> | 1999-12-14 07:00:22 +0000 |
|---|---|---|
| committer | Mumit Khan <khan@gcc.gnu.org> | 1999-12-14 07:00:22 +0000 |
| commit | 5574ac398a96628f3811d2e6bd2f7339cb1c7517 (patch) | |
| tree | 37e7d133d9229d05f391969abb7dd43cd9831d3f | |
| parent | 9b0b6c5118858730896ebae968149791c376f704 (diff) | |
| download | gcc-5574ac398a96628f3811d2e6bd2f7339cb1c7517.zip gcc-5574ac398a96628f3811d2e6bd2f7339cb1c7517.tar.gz gcc-5574ac398a96628f3811d2e6bd2f7339cb1c7517.tar.bz2 | |
class.c (finish_base_struct): Allow multiple COM base classes as well as non-COM bases as long as it's not...
1999-12-14 Mumit Khan <khan@xraylith.wisc.edu>
* class.c (finish_base_struct): Allow multiple COM base classes
as well as non-COM bases as long as it's not the leftmost.
From-SVN: r30901
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/class.c | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7f5425e..221dbd4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1999-12-14 Mumit Khan <khan@xraylith.wisc.edu> + + * class.c (finish_base_struct): Allow multiple COM base classes + as well as non-COM bases as long as it's not the leftmost. + 1999-12-13 Mumit Khan <khan@xraylith.wisc.edu> * lex.c (saving_parse_to_obstack): New global. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 7d2965d..60132b5 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1569,15 +1569,12 @@ finish_base_struct (t, b) if (CLASSTYPE_COM_INTERFACE (basetype)) { CLASSTYPE_COM_INTERFACE (t) = 1; - if (i > 0) - cp_error - ("COM interface type `%T' must be the leftmost base class", - basetype); } else if (CLASSTYPE_COM_INTERFACE (t) && i == 0) { - cp_error ("COM interface type `%T' with non-COM base class `%T'", - t, basetype); + cp_error + ("COM interface type `%T' with non-COM leftmost base class `%T'", + t, basetype); CLASSTYPE_COM_INTERFACE (t) = 0; } |