diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-02-09 12:18:24 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-02-09 12:18:24 -0500 |
| commit | 6f5d230fb9443e8c3e94e1469c20ae79f6db6eeb (patch) | |
| tree | 1c246531796c25a374507e127bb0830d33648dff /csharp/test | |
| parent | Added support to SKIP languages/configs/platforms (ICE-7567) (diff) | |
| download | ice-6f5d230fb9443e8c3e94e1469c20ae79f6db6eeb.tar.bz2 ice-6f5d230fb9443e8c3e94e1469c20ae79f6db6eeb.tar.xz ice-6f5d230fb9443e8c3e94e1469c20ae79f6db6eeb.zip | |
Fixed enum-related warnings
Diffstat (limited to 'csharp/test')
| -rw-r--r-- | csharp/test/Ice/defaultValue/Test.ice | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/csharp/test/Ice/defaultValue/Test.ice b/csharp/test/Ice/defaultValue/Test.ice index aad27bce2f7..67514ca2eba 100644 --- a/csharp/test/Ice/defaultValue/Test.ice +++ b/csharp/test/Ice/defaultValue/Test.ice @@ -10,9 +10,9 @@ #pragma once // -// Suppress invalid metadata warnings +// Suppress warnings // -[["suppress-warning:invalid-metadata"]] +[["suppress-warning:invalid-metadata, deprecated"]] module Test { @@ -39,12 +39,12 @@ struct Struct1 float f = 5.1; double d = 6.2; string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \007 \x07"; - Color c1 = ::Test::red; + Color c1 = ::Test::Color::red; Color c2 = Test::green; Color c3 = blue; - Nested::Color nc1 = ::Test::Nested::red; + Nested::Color nc1 = Test::Nested::Color::red; Nested::Color nc2 = Nested::green; - Nested::Color nc3 = Nested::blue; + Nested::Color nc3 = blue; string noDefault; int zeroI = 0; long zeroL = 0; @@ -62,12 +62,12 @@ const long ConstLong = 4; const float ConstFloat = 5.1; const double ConstDouble = 6.2; const string ConstString = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \007 \x07"; -const Color ConstColor1 = ::Test::red; +const Color ConstColor1 = ::Test::Color::red; const Color ConstColor2 = Test::green; const Color ConstColor3 = blue; -const Nested::Color ConstNestedColor1 = ::Test::Nested::red; +const Nested::Color ConstNestedColor1 = Test::Nested::Color::red; const Nested::Color ConstNestedColor2 = Test::Nested::green; -const Nested::Color ConstNestedColor3 = Nested::blue; +const Nested::Color ConstNestedColor3 = blue; const int ConstZeroI = 0; const long ConstZeroL = 0; const float ConstZeroF = 0; @@ -116,12 +116,12 @@ struct Struct3 float f = 5.1; double d = 6.2; //string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \007 \x07"; - Color c1 = ::Test::red; + Color c1 = ::Test::Color::red; Color c2 = Test::green; Color c3 = blue; - Nested::Color nc1 = ::Test::Nested::red; + Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; - Nested::Color nc3 = Nested::blue; + Nested::Color nc3 = blue; //string noDefault; int zeroI = 0; long zeroL = 0; @@ -147,12 +147,12 @@ struct Struct4 float f = 5.1; double d = 6.2; //string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \007 \x07"; - Color c1 = ::Test::red; + Color c1 = ::Test::Color::red; Color c2 = Test::green; Color c3 = blue; - Nested::Color nc1 = ::Test::Nested::red; + Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; - Nested::Color nc3 = Nested::blue; + Nested::Color nc3 = blue; //string noDefault; int zeroI = 0; long zeroL = 0; @@ -184,13 +184,13 @@ class Base class Derived extends Base { - Color c1 = ::Test::red; + Color c1 = ::Test::Color::red; Color c2 = Test::green; Color c3 = blue; - Nested::Color nc1 = ::Test::Nested::red; + Nested::Color nc1 = ::Test::Nested::Color::red; Nested::Color nc2 = Nested::green; - Nested::Color nc3 = Nested::blue; + Nested::Color nc3 = blue; }; exception BaseEx |