summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2023-10-24 10:01:02 +0200
committerJose <jose@zeroc.com>2023-10-24 10:01:02 +0200
commit8e227a45025f4c489a37370e5e02b16b29b614d0 (patch)
tree0942fb44dd3e0e70a9b8b2532d381f7cf53bc923 /cpp/test
parentFix Python 3.12 build (Closes 1558) (#1559) (diff)
downloadice-8e227a45025f4c489a37370e5e02b16b29b614d0.tar.bz2
ice-8e227a45025f4c489a37370e5e02b16b29b614d0.tar.xz
ice-8e227a45025f4c489a37370e5e02b16b29b614d0.zip
Fix Slice/errorDetection test failure
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Slice/errorDetection/IllegalMI.err10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Slice/errorDetection/IllegalMI.err b/cpp/test/Slice/errorDetection/IllegalMI.err
index 6bbd73afaba..f2440dd88de 100644
--- a/cpp/test/Slice/errorDetection/IllegalMI.err
+++ b/cpp/test/Slice/errorDetection/IllegalMI.err
@@ -19,8 +19,8 @@ IllegalMI.ice:653: ambiguous multiple inheritance: `A2' inherits operation `op'
IllegalMI.ice:689: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
IllegalMI.ice:776: operation `op' is already defined as an operation in a base interface or class
IllegalMI.ice:820: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:967: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:1041: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:1115: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:1187: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:1259: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:966: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1040: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1114: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1186: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1258: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces