summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2016-03-21 13:37:27 -0700
committerMark Spruiell <mes@zeroc.com>2016-03-21 13:37:27 -0700
commita0a8b50540a1dbc9ab447d974e30ab94d6852084 (patch)
treec2a9ed92921b571623238fdeb3746df96d5c45de /cpp
parentIceGridGUI start minimized in OS X (diff)
downloadice-a0a8b50540a1dbc9ab447d974e30ab94d6852084.tar.bz2
ice-a0a8b50540a1dbc9ab447d974e30ab94d6852084.tar.xz
ice-a0a8b50540a1dbc9ab447d974e30ab94d6852084.zip
version fixes
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.ice10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
index 83309f6c47a..13948e5c778 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
@@ -16,7 +16,7 @@ sequence<long> ls;
struct s00
{
- ls ls; // OK as Ice 3.6 (data member has its own scope)
+ ls ls; // OK as of Ice 3.6 (data member has its own scope)
ls l;
};
@@ -28,7 +28,7 @@ struct s0
struct s1
{
ls mem;
- long ls; // OK as Ice 3.6 (data member has its own scope)
+ long ls; // OK as of Ice 3.6 (data member has its own scope)
};
struct s2
@@ -124,15 +124,15 @@ interface ParamTest
{
void op(long param);
void op2(counter param);
- void param(counter counter); // OK as Ice 3.6 (parameters has its own scope)
- void op3(long counter, counter x); // OK as Ice 3.6.1 (Second "counter" is not a type)
+ void param(counter counter); // OK as of Ice 3.6 (parameters have their own scope)
+ void op3(long counter, counter x); // OK as of Ice 3.6.1 (second "counter" is not a type)
void op4(long param, long param);
};
sequence<int> IS;
struct x
{
- IS is; // OK as Ice 3.6 (parameters has its own scope)
+ IS is; // OK as of Ice 3.6 (data member has its own scope)
};
struct y