diff options
43 files changed, 95 insertions, 50 deletions
diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice index cd01a1f6a71..1b645416055 100644 --- a/cpp/test/Ice/gc/Test.ice +++ b/cpp/test/Ice/gc/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + module Test { diff --git a/cpp/test/Ice/impl/TestAMD.ice b/cpp/test/Ice/impl/TestAMD.ice index c3cd3ed48da..2c469a23406 100644 --- a/cpp/test/Ice/impl/TestAMD.ice +++ b/cpp/test/Ice/impl/TestAMD.ice @@ -265,14 +265,14 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; struct MyStruct1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct } class MyClass1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class } diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice index 5920e979a9d..355348a5ec9 100644 --- a/cpp/test/Ice/operations/Test.ice +++ b/cpp/test/Ice/operations/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + #include <Ice/Current.ice> module Test diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice index c3cd3ed48da..02e728e0080 100644 --- a/cpp/test/Ice/operations/TestAMD.ice +++ b/cpp/test/Ice/operations/TestAMD.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + #include <Ice/Current.ice> module Test diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice index d6fae007472..66bc9743501 100644 --- a/cpp/test/Ice/optional/Test.ice +++ b/cpp/test/Ice/optional/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:include:list", "cpp:include:CustomMap.h", "cpp:include:StringView.h"]] +[["cpp:include:list", "cpp:include:CustomMap.h", "cpp:include:StringView.h", "suppress-warning:deprecated"]] module Test { diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice index 1414bb7dccb..8c3d210a610 100644 --- a/cpp/test/Ice/optional/TestAMD.ice +++ b/cpp/test/Ice/optional/TestAMD.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:include:list", "cpp:include:CustomMap.h", "cpp:include:StringView.h"]] +[["cpp:include:list", "cpp:include:CustomMap.h", "cpp:include:StringView.h", "suppress-warning:deprecated"]] module Test { diff --git a/cpp/test/Slice/escape/Key.ice b/cpp/test/Slice/escape/Key.ice index 2806ec33e2e..373f33e8619 100644 --- a/cpp/test/Slice/escape/Key.ice +++ b/cpp/test/Slice/escape/Key.ice @@ -8,6 +8,7 @@ // ********************************************************************** [["underscore"]] +[["suppress-warning:deprecated"]] module and { diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice index ae7d619caf2..4ee208a421d 100644 --- a/csharp/test/Ice/operations/Test.ice +++ b/csharp/test/Ice/operations/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + #include <Ice/Current.ice> module Test diff --git a/csharp/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice index 0c3b091bbe3..546304a4535 100644 --- a/csharp/test/Ice/operations/TestAMD.ice +++ b/csharp/test/Ice/operations/TestAMD.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + #include <Ice/Current.ice> module Test diff --git a/csharp/test/Ice/optional/Test.ice b/csharp/test/Ice/optional/Test.ice index ab14aa7eb7c..aa6f87fd318 100644 --- a/csharp/test/Ice/optional/Test.ice +++ b/csharp/test/Ice/optional/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + module Test { diff --git a/csharp/test/Ice/optional/TestAMD.ice b/csharp/test/Ice/optional/TestAMD.ice index d2b20b21fce..7a2eae43cb3 100644 --- a/csharp/test/Ice/optional/TestAMD.ice +++ b/csharp/test/Ice/optional/TestAMD.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + module Test { diff --git a/csharp/test/Ice/serialize/AllTests.cs b/csharp/test/Ice/serialize/AllTests.cs index da98bc1e95d..55cb7946211 100644 --- a/csharp/test/Ice/serialize/AllTests.cs +++ b/csharp/test/Ice/serialize/AllTests.cs @@ -70,7 +70,7 @@ public class AllTests : TestCommon.AllTests Write("testing serialization... "); Flush(); - Ice.ObjectPrx proxy = communicator.stringToProxy("test"); + MyInterfacePrx proxy = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test")); MyException ex, ex2; ex = new MyException(); @@ -89,7 +89,8 @@ public class AllTests : TestCommon.AllTests ex.optValStruct = new Ice.Optional<ValStruct>(); ex.optRefStruct = new Ice.Optional<RefStruct>(); ex.optEnum = new Ice.Optional<MyEnum>(); - ex.optProxy = new Ice.Optional<Ice.ObjectPrx>(); + ex.optClass = new Ice.Optional<MyClass>(); + ex.optProxy = new Ice.Optional<MyInterfacePrx>(); ex2 = inOut(ex, communicator); test(ex.Equals(ex2)); @@ -99,7 +100,7 @@ public class AllTests : TestCommon.AllTests ex.i = 3; ex.l = 4; ex.vs = new ValStruct(true, 1, 2, 3, 4, MyEnum.enum2); - ex.rs = new RefStruct("RefStruct", "prop", proxy, new Ice.ObjectPrx[] { proxy, null, proxy }); + ex.rs = new RefStruct("RefStruct", "prop", null, proxy, new MyInterfacePrx[] { proxy, null, proxy }); ex.vss = new ValStruct[1]; ex.vss[0] = ex.vs; ex.vsl = new List<ValStruct>(); @@ -114,7 +115,7 @@ public class AllTests : TestCommon.AllTests ex.isd[5] = "five"; ex.ivd = new Dictionary<int, ValStruct>(); ex.ivd[1] = ex.vs; - ex.ipd = new Dictionary<int, Ice.ObjectPrx>() { { 1, proxy }, { 2, null }, { 3, proxy } }; + ex.ipd = new Dictionary<int, MyInterfacePrx>() { { 1, proxy }, { 2, null }, { 3, proxy } }; ex.issd = new SortedDictionary<int, string>(); ex.issd[3] = "three"; ex.optName = new Ice.Optional<string>("MyException"); @@ -122,7 +123,8 @@ public class AllTests : TestCommon.AllTests ex.optValStruct = new Ice.Optional<ValStruct>(ex.vs); ex.optRefStruct = new Ice.Optional<RefStruct>(ex.rs); ex.optEnum = new Ice.Optional<MyEnum>(MyEnum.enum3); - ex.optProxy = new Ice.Optional<Ice.ObjectPrx>(proxy); + ex.optClass = new Ice.Optional<MyClass>(null); + ex.optProxy = new Ice.Optional<MyInterfacePrx>(proxy); ex2 = inOut(ex, communicator); test(ex.Equals(ex2)); @@ -130,8 +132,9 @@ public class AllTests : TestCommon.AllTests rs = new RefStruct(); rs.s = "RefStruct"; rs.sp = "prop"; - rs.p = communicator.stringToProxy("test"); - rs.seq = new Ice.ObjectPrx[] { rs.p }; + rs.c = null; + rs.p = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test")); + rs.seq = new MyInterfacePrx[] { rs.p }; rs2 = inOut(rs, communicator); test(rs.Equals(rs2)); diff --git a/csharp/test/Ice/serialize/Test.ice b/csharp/test/Ice/serialize/Test.ice index e12a3748c19..cb3998bc3be 100644 --- a/csharp/test/Ice/serialize/Test.ice +++ b/csharp/test/Ice/serialize/Test.ice @@ -33,14 +33,20 @@ struct ValStruct MyEnum e; } -sequence<MyClass*> ProxySeq; +interface MyInterface +{ + void op(); +} + +sequence<MyInterface*> ProxySeq; ["clr:property"] struct RefStruct { string s; string sp; - MyClass* p; + MyClass c; + MyInterface* p; ProxySeq seq; } @@ -56,7 +62,7 @@ sequence<ValStruct> ValStructQueue; dictionary<int, string> IntStringD; dictionary<int, ValStruct> IntValStructD; -dictionary<int, MyClass*> IntProxyD; +dictionary<int, MyInterface*> IntProxyD; ["clr:generic:SortedDictionary"] dictionary<int, string> IntStringSD; @@ -86,7 +92,8 @@ exception MyException long l; ValStruct vs; RefStruct rs; - MyClass* c; + MyClass c; + MyInterface* p; ValStructS vss; ValStructList vsl; @@ -104,7 +111,8 @@ exception MyException optional(3) ValStruct optValStruct; optional(4) RefStruct optRefStruct; optional(5) MyEnum optEnum; - optional(6) MyClass* optProxy; + optional(6) MyClass optClass; + optional(7) MyInterface* optProxy; } } diff --git a/csharp/test/Ice/stream/AllTests.cs b/csharp/test/Ice/stream/AllTests.cs index e299d7802c9..82c4758c065 100644 --- a/csharp/test/Ice/stream/AllTests.cs +++ b/csharp/test/Ice/stream/AllTests.cs @@ -274,7 +274,7 @@ public class AllTests : TestCommon.AllTests s.d = 6.0; s.str = "7"; s.e = MyEnum.enum2; - s.p = communicator.stringToProxy("test:default"); + s.p = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test:default")); SmallStruct.ice_write(outS, s); var data = outS.finished(); var s2 = SmallStruct.ice_read(new Ice.InputStream(communicator, data)); @@ -523,7 +523,7 @@ public class AllTests : TestCommon.AllTests smallStructArray[i].d = 6.0; smallStructArray[i].str = "7"; smallStructArray[i].e = MyEnum.enum2; - smallStructArray[i].p = communicator.stringToProxy("test:default"); + smallStructArray[i].p = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test:default")); } var myClassArray = new MyClass[4]; diff --git a/csharp/test/Ice/stream/Test.ice b/csharp/test/Ice/stream/Test.ice index 3ae9ec93cad..3e6172400eb 100644 --- a/csharp/test/Ice/stream/Test.ice +++ b/csharp/test/Ice/stream/Test.ice @@ -40,7 +40,7 @@ struct SmallStruct double d; string str; MyEnum e; - MyClass* p; + MyInterface* p; } class OptionalClass diff --git a/csharp/test/Slice/escape/Key.ice b/csharp/test/Slice/escape/Key.ice index 256e1e57096..1c132fa574d 100644 --- a/csharp/test/Slice/escape/Key.ice +++ b/csharp/test/Slice/escape/Key.ice @@ -9,6 +9,7 @@ #pragma once +[["suppress-warning:deprecated"]] module abstract { diff --git a/java-compat/test/src/main/java/test/Ice/impl/Test.ice b/java-compat/test/src/main/java/test/Ice/impl/Test.ice index b05281bc0b4..1c7cdc16410 100644 --- a/java-compat/test/src/main/java/test/Ice/impl/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/impl/Test.ice @@ -265,14 +265,14 @@ interface MyClass struct MyStruct1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct } class MyClass1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class } diff --git a/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice index 7bdb98244b5..1065ad60459 100644 --- a/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice @@ -265,14 +265,14 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; struct MyStruct1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct } class MyClass1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class } diff --git a/java-compat/test/src/main/java/test/Ice/operations/Test.ice b/java-compat/test/src/main/java/test/Ice/operations/Test.ice index 84db5658348..db6838c0a4c 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/Test.ice @@ -11,7 +11,7 @@ #include <Ice/Current.ice> -[["java:package:test.Ice.operations"]] +[["java:package:test.Ice.operations", "suppress-warning:deprecated"]] module Test { diff --git a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice index 2e705f6fad8..a7f5b038492 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -11,7 +11,7 @@ #include <Ice/Current.ice> -[["java:package:test.Ice.operations.AMD"]] +[["java:package:test.Ice.operations.AMD", "suppress-warning:deprecated"]] module Test { diff --git a/java-compat/test/src/main/java/test/Ice/optional/Test.ice b/java-compat/test/src/main/java/test/Ice/optional/Test.ice index 3cbd11939b1..8240c840f2e 100644 --- a/java-compat/test/src/main/java/test/Ice/optional/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/optional/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["java:package:test.Ice.optional"]] +[["java:package:test.Ice.optional", "suppress-warning:deprecated"]] module Test { diff --git a/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice index 2c8da97f1b6..e6954289bbc 100644 --- a/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice @@ -9,7 +9,7 @@ #pragma once -[["java:package:test.Ice.optional.AMD"]] +[["java:package:test.Ice.optional.AMD", "suppress-warning:deprecated"]] module Test { diff --git a/java-compat/test/src/main/java/test/Ice/stream/Client.java b/java-compat/test/src/main/java/test/Ice/stream/Client.java index a07a9ed850c..2b13c8779e9 100644 --- a/java-compat/test/src/main/java/test/Ice/stream/Client.java +++ b/java-compat/test/src/main/java/test/Ice/stream/Client.java @@ -269,7 +269,7 @@ public class Client extends test.Util.Application s.d = 6.0; s.str = "7"; s.e = MyEnum.enum2; - s.p = MyClassPrxHelper.uncheckedCast(comm.stringToProxy("test:default")); + s.p = MyInterfacePrxHelper.uncheckedCast(comm.stringToProxy("test:default")); SmallStruct.ice_write(out, s); byte[] data = out.finished(); in = new Ice.InputStream(comm, data); diff --git a/java-compat/test/src/main/java/test/Ice/stream/Test.ice b/java-compat/test/src/main/java/test/Ice/stream/Test.ice index 11977f8558f..5c21f606bb7 100644 --- a/java-compat/test/src/main/java/test/Ice/stream/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/stream/Test.ice @@ -23,6 +23,7 @@ enum MyEnum } class MyClass; +interface MyInterface; ["java:serializable:test.Ice.stream.Serialize.Small"] sequence<byte> SerialSmall; @@ -37,7 +38,8 @@ struct SmallStruct double d; string str; MyEnum e; - MyClass* p; + MyClass c; + MyInterface* p; SerialSmall ss; } @@ -95,7 +97,7 @@ class Bar; class MyClass { MyClass c; - MyClass* prx; + MyInterface* prx; Object o; SmallStruct s; Ice::BoolSeq seq1; diff --git a/java-compat/test/src/main/java/test/Slice/escape/Key.ice b/java-compat/test/src/main/java/test/Slice/escape/Key.ice index 32a10166bff..402c73bc66b 100644 --- a/java-compat/test/src/main/java/test/Slice/escape/Key.ice +++ b/java-compat/test/src/main/java/test/Slice/escape/Key.ice @@ -9,7 +9,7 @@ #pragma once -[["java:package:test.Slice.escape"]] +[["java:package:test.Slice.escape", "suppress-warning:deprecated"]] module abstract { diff --git a/java/test/src/main/java/test/Ice/impl/Test.ice b/java/test/src/main/java/test/Ice/impl/Test.ice index 0640b19ce84..dfd37af7a80 100644 --- a/java/test/src/main/java/test/Ice/impl/Test.ice +++ b/java/test/src/main/java/test/Ice/impl/Test.ice @@ -265,14 +265,14 @@ interface MyClass struct MyStruct1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct } class MyClass1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class } diff --git a/java/test/src/main/java/test/Ice/impl/TestAMD.ice b/java/test/src/main/java/test/Ice/impl/TestAMD.ice index df6d9e43dca..eb2fb75565b 100644 --- a/java/test/src/main/java/test/Ice/impl/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/impl/TestAMD.ice @@ -265,14 +265,14 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; struct MyStruct1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct } class MyClass1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class } diff --git a/java/test/src/main/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice index c5c81a1b441..c334d820014 100644 --- a/java/test/src/main/java/test/Ice/operations/Test.ice +++ b/java/test/src/main/java/test/Ice/operations/Test.ice @@ -11,7 +11,7 @@ #include <Ice/Current.ice> -[["java:package:test.Ice.operations"]] +[["java:package:test.Ice.operations", "suppress-warning:deprecated"]] module Test { diff --git a/java/test/src/main/java/test/Ice/operations/TestAMD.ice b/java/test/src/main/java/test/Ice/operations/TestAMD.ice index 383e932d873..aad218b67d4 100644 --- a/java/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -11,7 +11,7 @@ #include <Ice/Current.ice> -[["java:package:test.Ice.operations.AMD"]] +[["java:package:test.Ice.operations.AMD", "suppress-warning:deprecated"]] module Test { diff --git a/java/test/src/main/java/test/Ice/optional/Test.ice b/java/test/src/main/java/test/Ice/optional/Test.ice index 96df8e694bb..6ae0808bfa8 100644 --- a/java/test/src/main/java/test/Ice/optional/Test.ice +++ b/java/test/src/main/java/test/Ice/optional/Test.ice @@ -9,7 +9,7 @@ #pragma once -[["java:package:test.Ice.optional"]] +[["java:package:test.Ice.optional", "suppress-warning:deprecated"]] module Test { diff --git a/java/test/src/main/java/test/Ice/optional/TestAMD.ice b/java/test/src/main/java/test/Ice/optional/TestAMD.ice index c21ede7338a..c6c1c4186b1 100644 --- a/java/test/src/main/java/test/Ice/optional/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/optional/TestAMD.ice @@ -9,7 +9,7 @@ #pragma once -[["java:package:test.Ice.optional.AMD"]] +[["java:package:test.Ice.optional.AMD", "suppress-warning:deprecated"]] module Test { diff --git a/java/test/src/main/java/test/Ice/stream/Client.java b/java/test/src/main/java/test/Ice/stream/Client.java index 8856eb9837a..82c880f536d 100644 --- a/java/test/src/main/java/test/Ice/stream/Client.java +++ b/java/test/src/main/java/test/Ice/stream/Client.java @@ -234,7 +234,7 @@ public class Client extends test.Util.Application s.d = 6.0; s.str = "7"; s.e = MyEnum.enum2; - s.p = comm.stringToProxy("test:default"); + s.p = MyInterfacePrx.uncheckedCast(comm.stringToProxy("test:default")); SmallStruct.ice_write(out, s); byte[] data = out.finished(); in = new InputStream(comm, data); diff --git a/java/test/src/main/java/test/Ice/stream/Test.ice b/java/test/src/main/java/test/Ice/stream/Test.ice index be82338035e..da777596af8 100644 --- a/java/test/src/main/java/test/Ice/stream/Test.ice +++ b/java/test/src/main/java/test/Ice/stream/Test.ice @@ -23,6 +23,7 @@ enum MyEnum } class MyClass; +interface MyInterface; ["java:serializable:test.Ice.stream.Serialize.Small"] sequence<byte> SerialSmall; @@ -37,7 +38,8 @@ struct SmallStruct double d; string str; MyEnum e; - MyClass* p; + MyClass c; + MyInterface* p; SerialSmall ss; } @@ -95,7 +97,7 @@ class Bar; class MyClass { MyClass c; - MyClass* prx; + MyInterface* prx; Object o; SmallStruct s; Ice::BoolSeq seq1; @@ -116,4 +118,8 @@ exception MyException MyClass c; } +interface MyInterface +{ +}; + } diff --git a/java/test/src/main/java/test/Slice/escape/Key.ice b/java/test/src/main/java/test/Slice/escape/Key.ice index 02c18be17dc..d6e1cdce2a2 100644 --- a/java/test/src/main/java/test/Slice/escape/Key.ice +++ b/java/test/src/main/java/test/Slice/escape/Key.ice @@ -9,7 +9,7 @@ #pragma once -[["java:package:test.Slice.escape"]] +[["java:package:test.Slice.escape", "suppress-warning:deprecated"]] module abstract { diff --git a/js/test/Ice/operations/Test.ice b/js/test/Ice/operations/Test.ice index cdc3ffeec66..18d7af12862 100644 --- a/js/test/Ice/operations/Test.ice +++ b/js/test/Ice/operations/Test.ice @@ -264,14 +264,14 @@ interface MyClass struct MyStruct1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct } class MyClass1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class } diff --git a/js/test/Ice/optional/Test.ice b/js/test/Ice/optional/Test.ice index ec08f154f3a..87472b7d454 100644 --- a/js/test/Ice/optional/Test.ice +++ b/js/test/Ice/optional/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + module Test { diff --git a/js/test/Slice/escape/Key.ice b/js/test/Slice/escape/Key.ice index 7d6615b0e00..4c27fa1b7ea 100644 --- a/js/test/Slice/escape/Key.ice +++ b/js/test/Slice/escape/Key.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + module await { diff --git a/php/test/Ice/operations/Test.ice b/php/test/Ice/operations/Test.ice index 9e16e25a89e..76ee0c41609 100644 --- a/php/test/Ice/operations/Test.ice +++ b/php/test/Ice/operations/Test.ice @@ -242,14 +242,14 @@ interface MyClass struct MyStruct1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct } class MyClass1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class } diff --git a/php/test/Ice/optional/Test.ice b/php/test/Ice/optional/Test.ice index 973fe23c962..9e1f0516e9b 100644 --- a/php/test/Ice/optional/Test.ice +++ b/php/test/Ice/optional/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + module Test { diff --git a/php/test/Slice/escape/Key.ice b/php/test/Slice/escape/Key.ice index 5f6abae15c1..0ec4f050ff0 100644 --- a/php/test/Slice/escape/Key.ice +++ b/php/test/Slice/escape/Key.ice @@ -7,7 +7,7 @@ // // ********************************************************************** -[["underscore"]] +[["underscore", "suppress-warning:deprecated"]] module and { diff --git a/python/test/Ice/operations/Test.ice b/python/test/Ice/operations/Test.ice index 4697fea8715..ad12e426866 100644 --- a/python/test/Ice/operations/Test.ice +++ b/python/test/Ice/operations/Test.ice @@ -263,14 +263,14 @@ interface MyClass struct MyStruct1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myStruct1; // Same name as the enclosing struct } class MyClass1 { string tesT; // Same name as the enclosing module - MyClass myClass; // Same name as an already defined class + MyClass* myClass; // Same name as an already defined class string myClass1; // Same name as the enclosing class } diff --git a/python/test/Ice/optional/Test.ice b/python/test/Ice/optional/Test.ice index 9e230aa3b16..948a4666e2f 100644 --- a/python/test/Ice/optional/Test.ice +++ b/python/test/Ice/optional/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["suppress-warning:deprecated"]] + module Test { diff --git a/python/test/Slice/escape/Key.ice b/python/test/Slice/escape/Key.ice index 3b5f2a6d4f6..19262c44794 100644 --- a/python/test/Slice/escape/Key.ice +++ b/python/test/Slice/escape/Key.ice @@ -7,6 +7,8 @@ // // ********************************************************************** +[["suppress-warning:deprecated"]] + module and { enum assert |