summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertiesI.h
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2002-06-24 07:57:54 +0000
committerMichi Henning <michi@zeroc.com>2002-06-24 07:57:54 +0000
commit34a3242a1305c74b6d114c987341ed8eaa9c6840 (patch)
treee553ebd78e1ac6270ea31f9a5a1faf5027a08cf6 /cpp/src/Ice/PropertiesI.h
parentremoved spaces after keywords (diff)
downloadice-34a3242a1305c74b6d114c987341ed8eaa9c6840.tar.bz2
ice-34a3242a1305c74b6d114c987341ed8eaa9c6840.tar.xz
ice-34a3242a1305c74b6d114c987341ed8eaa9c6840.zip
Added checks to disallow definition of a name in a derived class/interface
if that name is already defined in one of the base classes/interfaces. Added checks to disallow ambiguous multiple inheritance. The following (and many variations thereof) is illegal: interface A { void op(); }; interface B { long op(string s); }; interface C { void op(); }; interface D1 extends A, B { // Ambiguous multiple inheritance // ... }; interface D2 extends A, C { // Ambiguous multiple inheritance // ... }; Someone checked in a DOS-line ending file for Parser.h and Parser.cpp, so the CVS up-to-date check failed and the diff obviously produced a lot of noise. I think I merged everything correctly. There were a few places where the style had changed, from "if(..." to "if (..." (and similar for "while(...", and "for(...". The style guide says to use a space before the parenthesis, so that's how I left things.
Diffstat (limited to 'cpp/src/Ice/PropertiesI.h')
0 files changed, 0 insertions, 0 deletions