diff options
| -rw-r--r-- | cpp/test/Slice/errorDetection/OptionalMembers.err | 26 | ||||
| -rw-r--r-- | cpp/test/Slice/errorDetection/OptionalMembers.ice | 8 |
2 files changed, 18 insertions, 16 deletions
diff --git a/cpp/test/Slice/errorDetection/OptionalMembers.err b/cpp/test/Slice/errorDetection/OptionalMembers.err index d12e43a2b97..727ea9673f5 100644 --- a/cpp/test/Slice/errorDetection/OptionalMembers.err +++ b/cpp/test/Slice/errorDetection/OptionalMembers.err @@ -11,20 +11,20 @@ OptionalMembers.ice:33: tag for optional is out of range OptionalMembers.ice:33: invalid tag `C4' for optional OptionalMembers.ice:34: invalid tag `C5' for optional OptionalMembers.ice:36: tag for optional data member `m13' is already in use -OptionalMembers.ice:38: tag for optional data member `m15' is already in use -OptionalMembers.ice:53: missing tag for optional +OptionalMembers.ice:39: tag for optional data member `m16' is already in use OptionalMembers.ice:54: missing tag for optional -OptionalMembers.ice:55: `abc' is not defined -OptionalMembers.ice:56: tag for optional is out of range +OptionalMembers.ice:55: missing tag for optional +OptionalMembers.ice:56: `abc' is not defined OptionalMembers.ice:57: tag for optional is out of range OptionalMembers.ice:58: tag for optional is out of range -OptionalMembers.ice:60: tag for optional data member `m8' is already in use -OptionalMembers.ice:61: tag for optional is out of range -OptionalMembers.ice:61: invalid tag `C3' for optional +OptionalMembers.ice:59: tag for optional is out of range +OptionalMembers.ice:61: tag for optional data member `m8' is already in use OptionalMembers.ice:62: tag for optional is out of range -OptionalMembers.ice:62: invalid tag `C4' for optional -OptionalMembers.ice:63: invalid tag `C5' for optional -OptionalMembers.ice:65: tag for optional data member `m13' is already in use -OptionalMembers.ice:67: tag for optional data member `m15' is already in use -OptionalMembers.ice:82: optional data members not supported in struct -OptionalMembers.ice:83: optional data members not supported in struct +OptionalMembers.ice:62: invalid tag `C3' for optional +OptionalMembers.ice:63: tag for optional is out of range +OptionalMembers.ice:63: invalid tag `C4' for optional +OptionalMembers.ice:64: invalid tag `C5' for optional +OptionalMembers.ice:66: tag for optional data member `m13' is already in use +OptionalMembers.ice:69: tag for optional data member `m16' is already in use +OptionalMembers.ice:84: optional data members not supported in struct +OptionalMembers.ice:85: optional data members not supported in struct diff --git a/cpp/test/Slice/errorDetection/OptionalMembers.ice b/cpp/test/Slice/errorDetection/OptionalMembers.ice index cd2e8e5d2c2..0c552f30725 100644 --- a/cpp/test/Slice/errorDetection/OptionalMembers.ice +++ b/cpp/test/Slice/errorDetection/OptionalMembers.ice @@ -17,7 +17,7 @@ const long C4 = 0x80000001; const float C5 = 1.1; const long C6 = 2; -enum E { e1, e2, e3 }; +enum E { e1, e2, e3 = 4 }; class C { @@ -35,7 +35,8 @@ class C optional(C6) bool m12; // ok optional(e1) int m13; // duplicate tag optional(e2) int m14; // ok - optional(e3) int m15; // duplicate tag + optional(e3) int m15; // ok + optional(4) int m16; // duplicate tag }; class Base @@ -64,7 +65,8 @@ class Ex optional(C6) bool m12; // ok optional(e1) int m13; // duplicate tag optional(e2) int m14; // ok - optional(e3) int m15; // duplicate tag + optional(e3) int m15; // ok + optional(4) int m16; // duplicate tag }; class BaseEx |