summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcpp/test/Ice/stream/Client.cpp80
-rw-r--r--cpp/test/Ice/stream/Makefile2
-rw-r--r--cpp/test/Ice/stream/Makefile.mak2
-rw-r--r--cpp/test/Ice/stream/Test.ice42
-rw-r--r--cs/src/Ice/Makefile5
-rw-r--r--cs/src/Ice/Makefile.mak5
-rw-r--r--cs/test/Ice/stream/Client.cs32
-rw-r--r--cs/test/Ice/stream/Makefile2
-rw-r--r--cs/test/Ice/stream/Makefile.mak2
-rw-r--r--cs/test/Ice/stream/Test.ice46
-rw-r--r--java/test/Ice/stream/Client.java48
-rw-r--r--java/test/Ice/stream/Test.ice42
12 files changed, 150 insertions, 158 deletions
diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp
index 5519d9eca49..a84fcd32503 100755
--- a/cpp/test/Ice/stream/Client.cpp
+++ b/cpp/test/Ice/stream/Client.cpp
@@ -358,7 +358,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
{
- Test::BoolS arr;
+ Ice::BoolSeq arr;
arr.push_back(true);
arr.push_back(false);
arr.push_back(true);
@@ -369,13 +369,13 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::BoolS arr2;
+ Ice::BoolSeq arr2;
in->read(arr2);
test(arr2 == arr);
Test::BoolSS arrS;
arrS.push_back(arr);
- arrS.push_back(Test::BoolS());
+ arrS.push_back(Ice::BoolSeq());
arrS.push_back(arr);
out = Ice::createOutputStream(communicator);
@@ -389,7 +389,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
{
- Test::ByteS arr;
+ Ice::ByteSeq arr;
arr.push_back(0x01);
arr.push_back(0x11);
arr.push_back(0x12);
@@ -399,13 +399,13 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->write(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::ByteS arr2;
+ Ice::ByteSeq arr2;
in->read(arr2);
test(arr2 == arr);
Test::ByteSS arrS;
arrS.push_back(arr);
- arrS.push_back(Test::ByteS());
+ arrS.push_back(Ice::ByteSeq());
arrS.push_back(arr);
out = Ice::createOutputStream(communicator);
@@ -419,7 +419,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
{
- Test::ShortS arr;
+ Ice::ShortSeq arr;
arr.push_back(0x01);
arr.push_back(0x11);
arr.push_back(0x12);
@@ -428,13 +428,13 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->write(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::ShortS arr2;
+ Ice::ShortSeq arr2;
in->read(arr2);
test(arr2 == arr);
Test::ShortSS arrS;
arrS.push_back(arr);
- arrS.push_back(Test::ShortS());
+ arrS.push_back(Ice::ShortSeq());
arrS.push_back(arr);
out = Ice::createOutputStream(communicator);
@@ -448,7 +448,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
{
- Test::IntS arr;
+ Ice::IntSeq arr;
arr.push_back(0x01);
arr.push_back(0x11);
arr.push_back(0x12);
@@ -457,13 +457,13 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->write(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::IntS arr2;
+ Ice::IntSeq arr2;
in->read(arr2);
test(arr2 == arr);
Test::IntSS arrS;
arrS.push_back(arr);
- arrS.push_back(Test::IntS());
+ arrS.push_back(Ice::IntSeq());
arrS.push_back(arr);
out = Ice::createOutputStream(communicator);
@@ -477,7 +477,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
{
- Test::LongS arr;
+ Ice::LongSeq arr;
arr.push_back(0x01);
arr.push_back(0x11);
arr.push_back(0x12);
@@ -486,13 +486,13 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->write(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::LongS arr2;
+ Ice::LongSeq arr2;
in->read(arr2);
test(arr2 == arr);
Test::LongSS arrS;
arrS.push_back(arr);
- arrS.push_back(Test::LongS());
+ arrS.push_back(Ice::LongSeq());
arrS.push_back(arr);
out = Ice::createOutputStream(communicator);
@@ -506,7 +506,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
{
- Test::FloatS arr;
+ Ice::FloatSeq arr;
arr.push_back(1);
arr.push_back(2);
arr.push_back(3);
@@ -515,13 +515,13 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->write(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::FloatS arr2;
+ Ice::FloatSeq arr2;
in->read(arr2);
test(arr2 == arr);
Test::FloatSS arrS;
arrS.push_back(arr);
- arrS.push_back(Test::FloatS());
+ arrS.push_back(Ice::FloatSeq());
arrS.push_back(arr);
out = Ice::createOutputStream(communicator);
@@ -535,7 +535,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
{
- Test::DoubleS arr;
+ Ice::DoubleSeq arr;
arr.push_back(1);
arr.push_back(2);
arr.push_back(3);
@@ -544,13 +544,13 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->write(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::DoubleS arr2;
+ Ice::DoubleSeq arr2;
in->read(arr2);
test(arr2 == arr);
Test::DoubleSS arrS;
arrS.push_back(arr);
- arrS.push_back(Test::DoubleS());
+ arrS.push_back(Ice::DoubleSeq());
arrS.push_back(arr);
out = Ice::createOutputStream(communicator);
@@ -564,7 +564,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
{
- Test::StringS arr;
+ Ice::StringSeq arr;
arr.push_back("string1");
arr.push_back("string2");
arr.push_back("string3");
@@ -573,13 +573,13 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->write(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::StringS arr2;
+ Ice::StringSeq arr2;
in->read(arr2);
test(arr2 == arr);
Test::StringSS arrS;
arrS.push_back(arr);
- arrS.push_back(Test::StringS());
+ arrS.push_back(Ice::StringSeq());
arrS.push_back(arr);
out = Ice::createOutputStream(communicator);
@@ -1247,7 +1247,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
}
#endif
{
- Test::BoolS arr;
+ Ice::BoolSeq arr;
arr.push_back(true);
arr.push_back(false);
arr.push_back(true);
@@ -1257,12 +1257,12 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->writeBoolSeq(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::BoolS arr2 = in->readBoolSeq();
+ Ice::BoolSeq arr2 = in->readBoolSeq();
test(arr2 == arr);
}
{
- Test::ByteS arr;
+ Ice::ByteSeq arr;
arr.push_back(0x01);
arr.push_back(0x11);
arr.push_back(0x12);
@@ -1272,12 +1272,12 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->writeByteSeq(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::ByteS arr2 = in->readByteSeq();
+ Ice::ByteSeq arr2 = in->readByteSeq();
test(arr2 == arr);
}
{
- Test::ShortS arr;
+ Ice::ShortSeq arr;
arr.push_back(0x01);
arr.push_back(0x11);
arr.push_back(0x12);
@@ -1286,12 +1286,12 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->writeShortSeq(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::ShortS arr2 = in->readShortSeq();
+ Ice::ShortSeq arr2 = in->readShortSeq();
test(arr2 == arr);
}
{
- Test::IntS arr;
+ Ice::IntSeq arr;
arr.push_back(0x01);
arr.push_back(0x11);
arr.push_back(0x12);
@@ -1300,12 +1300,12 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->writeIntSeq(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::IntS arr2 = in->readIntSeq();
+ Ice::IntSeq arr2 = in->readIntSeq();
test(arr2 == arr);
}
{
- Test::LongS arr;
+ Ice::LongSeq arr;
arr.push_back(0x01);
arr.push_back(0x11);
arr.push_back(0x12);
@@ -1314,12 +1314,12 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->writeLongSeq(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::LongS arr2 = in->readLongSeq();
+ Ice::LongSeq arr2 = in->readLongSeq();
test(arr2 == arr);
}
{
- Test::FloatS arr;
+ Ice::FloatSeq arr;
arr.push_back(1);
arr.push_back(2);
arr.push_back(3);
@@ -1328,12 +1328,12 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->writeFloatSeq(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::FloatS arr2 = in->readFloatSeq();
+ Ice::FloatSeq arr2 = in->readFloatSeq();
test(arr2 == arr);
}
{
- Test::DoubleS arr;
+ Ice::DoubleSeq arr;
arr.push_back(1);
arr.push_back(2);
arr.push_back(3);
@@ -1342,12 +1342,12 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->writeDoubleSeq(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::DoubleS arr2 = in->readDoubleSeq();
+ Ice::DoubleSeq arr2 = in->readDoubleSeq();
test(arr2 == arr);
}
{
- Test::StringS arr;
+ Ice::StringSeq arr;
arr.push_back("string1");
arr.push_back("string2");
arr.push_back("string3");
@@ -1356,7 +1356,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
out->writeStringSeq(arr);
out->finished(data);
in = Ice::createInputStream(communicator, data);
- Test::StringS arr2 = in->readStringSeq();
+ Ice::StringSeq arr2 = in->readStringSeq();
test(arr2 == arr);
}
#if defined(_MSC_VER) && (_MSC_VER < 1300)
diff --git a/cpp/test/Ice/stream/Makefile b/cpp/test/Ice/stream/Makefile
index 7b28cc515c9..cc4783d667d 100644
--- a/cpp/test/Ice/stream/Makefile
+++ b/cpp/test/Ice/stream/Makefile
@@ -25,7 +25,7 @@ SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. -I../../include $(CPPFLAGS)
-SLICE2CPPFLAGS := --stream $(SLICE2CPPFLAGS)
+SLICE2CPPFLAGS := --stream $(SLICE2CPPFLAGS) -I$(slicedir)
$(CLIENT): $(OBJS) $(COBJS)
rm -f $@
diff --git a/cpp/test/Ice/stream/Makefile.mak b/cpp/test/Ice/stream/Makefile.mak
index 54634e092d4..d65d13dfe58 100644
--- a/cpp/test/Ice/stream/Makefile.mak
+++ b/cpp/test/Ice/stream/Makefile.mak
@@ -20,7 +20,7 @@ SRCS = $(COBJS:.obj=.cpp)
!include $(top_srcdir)/config/Make.rules.mak
-SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS)
+SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS)
CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
!if "$(GENERATE_PDB)" == "yes"
diff --git a/cpp/test/Ice/stream/Test.ice b/cpp/test/Ice/stream/Test.ice
index b776bf1f750..85359dd2aa3 100644
--- a/cpp/test/Ice/stream/Test.ice
+++ b/cpp/test/Ice/stream/Test.ice
@@ -10,6 +10,8 @@
#ifndef TEST_ICE
#define TEST_ICE
+#include <Ice/BuiltinSequences.ice>
+
module Test
{
@@ -41,26 +43,18 @@ struct SmallStruct
int i;
};
-sequence<bool> BoolS;
-sequence<byte> ByteS;
-sequence<short> ShortS;
-sequence<int> IntS;
-sequence<long> LongS;
-sequence<float> FloatS;
-sequence<double> DoubleS;
-sequence<string> StringS;
sequence<MyEnum> MyEnumS;
sequence<SmallStruct> SmallStructS;
sequence<MyClass> MyClassS;
-sequence<BoolS> BoolSS;
-sequence<ByteS> ByteSS;
-sequence<ShortS> ShortSS;
-sequence<IntS> IntSS;
-sequence<LongS> LongSS;
-sequence<FloatS> FloatSS;
-sequence<DoubleS> DoubleSS;
-sequence<StringS> StringSS;
+sequence<Ice::BoolSeq> BoolSS;
+sequence<Ice::ByteSeq> ByteSS;
+sequence<Ice::ShortSeq> ShortSS;
+sequence<Ice::IntSeq> IntSS;
+sequence<Ice::LongSeq> LongSS;
+sequence<Ice::FloatSeq> FloatSS;
+sequence<Ice::DoubleSeq> DoubleSS;
+sequence<Ice::StringSeq> StringSS;
sequence<MyEnumS> MyEnumSS;
sequence<SmallStructS> SmallStructSS;
sequence<MyClassS> MyClassSS;
@@ -76,14 +70,14 @@ class MyClass
MyClass c;
Object o;
SmallStruct s;
- BoolS seq1;
- ByteS seq2;
- ShortS seq3;
- IntS seq4;
- LongS seq5;
- FloatS seq6;
- DoubleS seq7;
- StringS seq8;
+ Ice::BoolSeq seq1;
+ Ice::ByteSeq seq2;
+ Ice::ShortSeq seq3;
+ Ice::IntSeq seq4;
+ Ice::LongSeq seq5;
+ Ice::FloatSeq seq6;
+ Ice::DoubleSeq seq7;
+ Ice::StringSeq seq8;
MyEnumS seq9;
MyClassS seq10;
StringMyClassD d;
diff --git a/cs/src/Ice/Makefile b/cs/src/Ice/Makefile
index 574a8c3dee1..cff91416406 100644
--- a/cs/src/Ice/Makefile
+++ b/cs/src/Ice/Makefile
@@ -173,4 +173,9 @@ install:: all
clean::
-rm -f $(bindir)/$(PKG).xml
+$(GDIR)/BuiltinSequences.cs: $(SDIR)/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB)
+ rm -f $(GDIR)/BuiltinSequences.cs
+ $(SLICE2CS) $(SLICE2CSFLAGS) --stream $(SDIR)/BuiltinSequences.ice
+ mv BuiltinSequences.cs $(GDIR)
+
include .depend
diff --git a/cs/src/Ice/Makefile.mak b/cs/src/Ice/Makefile.mak
index 07e52c13469..06f752780b4 100644
--- a/cs/src/Ice/Makefile.mak
+++ b/cs/src/Ice/Makefile.mak
@@ -172,4 +172,9 @@ install:: all
copy $(bindir)\$(PKG).pdb "$(install_bindir)"
!endif
+$(GDIR)\BuiltinSequences.cs: $(SDIR)\BuiltinSequences.ice $(SLICE2CS) $(SLICEPARSERLIB)
+ del /q $(GDIR)\BuiltinSequences.cs
+ $(SLICE2CS) $(SLICE2CSFLAGS) --stream $(SDIR)\BuiltinSequences.ice
+ move BuiltinSequences.cs $(GDIR)
+
!include .depend.mak
diff --git a/cs/test/Ice/stream/Client.cs b/cs/test/Ice/stream/Client.cs
index 6f7b729433c..9771b38281a 100644
--- a/cs/test/Ice/stream/Client.cs
+++ b/cs/test/Ice/stream/Client.cs
@@ -347,10 +347,10 @@ public class Client
false
};
@out = Ice.Util.createOutputStream(communicator);
- Test.BoolSHelper.write(@out, arr);
+ Ice.BoolSeqHelper.write(@out, arr);
byte[] data = @out.finished();
@in = Ice.Util.createInputStream(communicator, data);
- bool[] arr2 = Test.BoolSHelper.read(@in);
+ bool[] arr2 = Ice.BoolSeqHelper.read(@in);
test(Compare(arr2, arr));
@out.destroy();
@in.destroy();
@@ -380,10 +380,10 @@ public class Client
(byte)0x22
};
@out = Ice.Util.createOutputStream(communicator);
- Test.ByteSHelper.write(@out, arr);
+ Ice.ByteSeqHelper.write(@out, arr);
byte[] data = @out.finished();
@in = Ice.Util.createInputStream(communicator, data);
- byte[] arr2 = Test.ByteSHelper.read(@in);
+ byte[] arr2 = Ice.ByteSeqHelper.read(@in);
test(Compare(arr2, arr));
@out.destroy();
@in.destroy();
@@ -426,10 +426,10 @@ public class Client
(short)0x22
};
@out = Ice.Util.createOutputStream(communicator);
- Test.ShortSHelper.write(@out, arr);
+ Ice.ShortSeqHelper.write(@out, arr);
byte[] data = @out.finished();
@in = Ice.Util.createInputStream(communicator, data);
- short[] arr2 = Test.ShortSHelper.read(@in);
+ short[] arr2 = Ice.ShortSeqHelper.read(@in);
test(Compare(arr2, arr));
@out.destroy();
@in.destroy();
@@ -459,10 +459,10 @@ public class Client
0x22
};
@out = Ice.Util.createOutputStream(communicator);
- Test.IntSHelper.write(@out, arr);
+ Ice.IntSeqHelper.write(@out, arr);
byte[] data = @out.finished();
@in = Ice.Util.createInputStream(communicator, data);
- int[] arr2 = Test.IntSHelper.read(@in);
+ int[] arr2 = Ice.IntSeqHelper.read(@in);
test(Compare(arr2, arr));
@out.destroy();
@in.destroy();
@@ -492,10 +492,10 @@ public class Client
0x22
};
@out = Ice.Util.createOutputStream(communicator);
- Test.LongSHelper.write(@out, arr);
+ Ice.LongSeqHelper.write(@out, arr);
byte[] data = @out.finished();
@in = Ice.Util.createInputStream(communicator, data);
- long[] arr2 = Test.LongSHelper.read(@in);
+ long[] arr2 = Ice.LongSeqHelper.read(@in);
test(Compare(arr2, arr));
@out.destroy();
@in.destroy();
@@ -525,10 +525,10 @@ public class Client
(float)4
};
@out = Ice.Util.createOutputStream(communicator);
- Test.FloatSHelper.write(@out, arr);
+ Ice.FloatSeqHelper.write(@out, arr);
byte[] data = @out.finished();
@in = Ice.Util.createInputStream(communicator, data);
- float[] arr2 = Test.FloatSHelper.read(@in);
+ float[] arr2 = Ice.FloatSeqHelper.read(@in);
test(Compare(arr2, arr));
@out.destroy();
@in.destroy();
@@ -558,10 +558,10 @@ public class Client
(double)4
};
@out = Ice.Util.createOutputStream(communicator);
- Test.DoubleSHelper.write(@out, arr);
+ Ice.DoubleSeqHelper.write(@out, arr);
byte[] data = @out.finished();
@in = Ice.Util.createInputStream(communicator, data);
- double[] arr2 = Test.DoubleSHelper.read(@in);
+ double[] arr2 = Ice.DoubleSeqHelper.read(@in);
test(Compare(arr2, arr));
@out.destroy();
@in.destroy();
@@ -591,10 +591,10 @@ public class Client
"string4"
};
@out = Ice.Util.createOutputStream(communicator);
- Test.StringSHelper.write(@out, arr);
+ Ice.StringSeqHelper.write(@out, arr);
byte[] data = @out.finished();
@in = Ice.Util.createInputStream(communicator, data);
- string[] arr2 = Test.StringSHelper.read(@in);
+ string[] arr2 = Ice.StringSeqHelper.read(@in);
test(Compare(arr2, arr));
@out.destroy();
@in.destroy();
diff --git a/cs/test/Ice/stream/Makefile b/cs/test/Ice/stream/Makefile
index 4a5d6126a3d..fa5e7c8782b 100644
--- a/cs/test/Ice/stream/Makefile
+++ b/cs/test/Ice/stream/Makefile
@@ -23,7 +23,7 @@ include $(top_srcdir)/config/Make.rules.cs
MCSFLAGS := $(MCSFLAGS) -target:exe
-SLICE2CSFLAGS := $(SLICE2CSFLAGS) --stream -I.
+SLICE2CSFLAGS := $(SLICE2CSFLAGS) --stream -I. -I$(slicedir)
client.exe: $(C_SRCS) $(GEN_SRCS) Serializable.dll
$(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) -r:Serializable.dll $(C_SRCS) $(GEN_SRCS)
diff --git a/cs/test/Ice/stream/Makefile.mak b/cs/test/Ice/stream/Makefile.mak
index 26bae227434..a556597d8e4 100644
--- a/cs/test/Ice/stream/Makefile.mak
+++ b/cs/test/Ice/stream/Makefile.mak
@@ -23,7 +23,7 @@ GDIR = generated
MCSFLAGS = $(MCSFLAGS) -target:exe
-SLICE2CSFLAGS = $(SLICE2CSFLAGS) --stream -I.
+SLICE2CSFLAGS = $(SLICE2CSFLAGS) --stream -I. -I$(slicedir)
client.exe: $(C_SRCS) $(GEN_SRCS) Serializable.dll
$(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" -r:Serializable.dll $(C_SRCS) $(GEN_SRCS)
diff --git a/cs/test/Ice/stream/Test.ice b/cs/test/Ice/stream/Test.ice
index fffba908b39..ab4ed2a8ddd 100644
--- a/cs/test/Ice/stream/Test.ice
+++ b/cs/test/Ice/stream/Test.ice
@@ -10,6 +10,8 @@
#ifndef TEST_ICE
#define TEST_ICE
+#include <Ice/BuiltinSequences.ice>
+
module Test
{
@@ -36,25 +38,17 @@ struct SmallStruct
MyClass* p;
};
-sequence<bool> BoolS;
-sequence<byte> ByteS;
-sequence<short> ShortS;
-sequence<int> IntS;
-sequence<long> LongS;
-sequence<float> FloatS;
-sequence<double> DoubleS;
-sequence<string> StringS;
sequence<MyEnum> MyEnumS;
sequence<MyClass> MyClassS;
-sequence<BoolS> BoolSS;
-sequence<ByteS> ByteSS;
-sequence<ShortS> ShortSS;
-sequence<IntS> IntSS;
-sequence<LongS> LongSS;
-sequence<FloatS> FloatSS;
-sequence<DoubleS> DoubleSS;
-sequence<StringS> StringSS;
+sequence<Ice::BoolSeq> BoolSS;
+sequence<Ice::ByteSeq> ByteSS;
+sequence<Ice::ShortSeq> ShortSS;
+sequence<Ice::IntSeq> IntSS;
+sequence<Ice::LongSeq> LongSS;
+sequence<Ice::FloatSeq> FloatSS;
+sequence<Ice::DoubleSeq> DoubleSS;
+sequence<Ice::StringSeq> StringSS;
sequence<MyEnumS> MyEnumSS;
sequence<MyClassS> MyClassSS;
@@ -116,9 +110,9 @@ sequence<SmallStruct> SmallStructCollection;
sequence<MyClass> MyClassCollection;
["clr:generic:List"]
-sequence<StringS> StringSList;
+sequence<Ice::StringSeq> StringSList;
["clr:generic:Stack"]
-sequence<StringS> StringSStack;
+sequence<Ice::StringSeq> StringSStack;
["clr:generic:SortedDictionary"]
dictionary<string, string> SortedStringStringD;
@@ -132,14 +126,14 @@ class MyClass
MyClass c;
Object o;
SmallStruct s;
- BoolS seq1;
- ByteS seq2;
- ShortS seq3;
- IntS seq4;
- LongS seq5;
- FloatS seq6;
- DoubleS seq7;
- StringS seq8;
+ Ice::BoolSeq seq1;
+ Ice::ByteSeq seq2;
+ Ice::ShortSeq seq3;
+ Ice::IntSeq seq4;
+ Ice::LongSeq seq5;
+ Ice::FloatSeq seq6;
+ Ice::DoubleSeq seq7;
+ Ice::StringSeq seq8;
MyEnumS seq9;
MyClassS seq10;
StringMyClassD d;
diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index e1d91bc279f..38a5ad63815 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -11,14 +11,14 @@ package test.Ice.stream;
import java.io.PrintWriter;
-import test.Ice.stream.Test.BoolSHelper;
-import test.Ice.stream.Test.ByteSHelper;
-import test.Ice.stream.Test.DoubleSHelper;
-import test.Ice.stream.Test.FloatSHelper;
-import test.Ice.stream.Test.ShortSHelper;
-import test.Ice.stream.Test.IntSHelper;
-import test.Ice.stream.Test.LongSHelper;
-import test.Ice.stream.Test.StringSHelper;
+import Ice.BoolSeqHelper;
+import Ice.ByteSeqHelper;
+import Ice.DoubleSeqHelper;
+import Ice.FloatSeqHelper;
+import Ice.ShortSeqHelper;
+import Ice.IntSeqHelper;
+import Ice.LongSeqHelper;
+import Ice.StringSeqHelper;
import test.Ice.stream.Test.BoolSSHelper;
import test.Ice.stream.Test.ByteSSHelper;
import test.Ice.stream.Test.DoubleSSHelper;
@@ -347,10 +347,10 @@ public class Client extends test.Util.Application
false
};
out = Ice.Util.createOutputStream(comm);
- BoolSHelper.write(out, arr);
+ BoolSeqHelper.write(out, arr);
byte[] data = out.finished();
in = Ice.Util.createInputStream(comm, data);
- boolean[] arr2 = BoolSHelper.read(in);
+ boolean[] arr2 = BoolSeqHelper.read(in);
test(java.util.Arrays.equals(arr2, arr));
out.destroy();
in.destroy();
@@ -380,10 +380,10 @@ public class Client extends test.Util.Application
(byte)0x22
};
out = Ice.Util.createOutputStream(comm);
- ByteSHelper.write(out, arr);
+ ByteSeqHelper.write(out, arr);
byte[] data = out.finished();
in = Ice.Util.createInputStream(comm, data);
- byte[] arr2 = ByteSHelper.read(in);
+ byte[] arr2 = ByteSeqHelper.read(in);
test(java.util.Arrays.equals(arr2, arr));
out.destroy();
in.destroy();
@@ -426,10 +426,10 @@ public class Client extends test.Util.Application
(short)0x22
};
out = Ice.Util.createOutputStream(comm);
- ShortSHelper.write(out, arr);
+ ShortSeqHelper.write(out, arr);
byte[] data = out.finished();
in = Ice.Util.createInputStream(comm, data);
- short[] arr2 = ShortSHelper.read(in);
+ short[] arr2 = ShortSeqHelper.read(in);
test(java.util.Arrays.equals(arr2, arr));
out.destroy();
in.destroy();
@@ -459,10 +459,10 @@ public class Client extends test.Util.Application
0x22
};
out = Ice.Util.createOutputStream(comm);
- IntSHelper.write(out, arr);
+ IntSeqHelper.write(out, arr);
byte[] data = out.finished();
in = Ice.Util.createInputStream(comm, data);
- int[] arr2 = IntSHelper.read(in);
+ int[] arr2 = IntSeqHelper.read(in);
test(java.util.Arrays.equals(arr2, arr));
out.destroy();
in.destroy();
@@ -492,10 +492,10 @@ public class Client extends test.Util.Application
0x22
};
out = Ice.Util.createOutputStream(comm);
- LongSHelper.write(out, arr);
+ LongSeqHelper.write(out, arr);
byte[] data = out.finished();
in = Ice.Util.createInputStream(comm, data);
- long[] arr2 = LongSHelper.read(in);
+ long[] arr2 = LongSeqHelper.read(in);
test(java.util.Arrays.equals(arr2, arr));
out.destroy();
in.destroy();
@@ -525,10 +525,10 @@ public class Client extends test.Util.Application
(float)4
};
out = Ice.Util.createOutputStream(comm);
- FloatSHelper.write(out, arr);
+ FloatSeqHelper.write(out, arr);
byte[] data = out.finished();
in = Ice.Util.createInputStream(comm, data);
- float[] arr2 = FloatSHelper.read(in);
+ float[] arr2 = FloatSeqHelper.read(in);
test(java.util.Arrays.equals(arr2, arr));
out.destroy();
in.destroy();
@@ -558,10 +558,10 @@ public class Client extends test.Util.Application
(double)4
};
out = Ice.Util.createOutputStream(comm);
- DoubleSHelper.write(out, arr);
+ DoubleSeqHelper.write(out, arr);
byte[] data = out.finished();
in = Ice.Util.createInputStream(comm, data);
- double[] arr2 = DoubleSHelper.read(in);
+ double[] arr2 = DoubleSeqHelper.read(in);
test(java.util.Arrays.equals(arr2, arr));
out.destroy();
in.destroy();
@@ -591,10 +591,10 @@ public class Client extends test.Util.Application
"string4"
};
out = Ice.Util.createOutputStream(comm);
- StringSHelper.write(out, arr);
+ StringSeqHelper.write(out, arr);
byte[] data = out.finished();
in = Ice.Util.createInputStream(comm, data);
- String[] arr2 = StringSHelper.read(in);
+ String[] arr2 = StringSeqHelper.read(in);
test(java.util.Arrays.equals(arr2, arr));
out.destroy();
in.destroy();
diff --git a/java/test/Ice/stream/Test.ice b/java/test/Ice/stream/Test.ice
index 32c8e47a7db..f1efebf1da0 100644
--- a/java/test/Ice/stream/Test.ice
+++ b/java/test/Ice/stream/Test.ice
@@ -10,6 +10,8 @@
#ifndef TEST_ICE
#define TEST_ICE
+#include <Ice/BuiltinSequences.ice>
+
[["java:package:test.Ice.stream"]]
module Test
{
@@ -40,25 +42,17 @@ struct SmallStruct
SerialSmall ss;
};
-sequence<bool> BoolS;
-sequence<byte> ByteS;
-sequence<short> ShortS;
-sequence<int> IntS;
-sequence<long> LongS;
-sequence<float> FloatS;
-sequence<double> DoubleS;
-sequence<string> StringS;
sequence<MyEnum> MyEnumS;
sequence<MyClass> MyClassS;
-sequence<BoolS> BoolSS;
-sequence<ByteS> ByteSS;
-sequence<ShortS> ShortSS;
-sequence<IntS> IntSS;
-sequence<LongS> LongSS;
-sequence<FloatS> FloatSS;
-sequence<DoubleS> DoubleSS;
-sequence<StringS> StringSS;
+sequence<Ice::BoolSeq> BoolSS;
+sequence<Ice::ByteSeq> ByteSS;
+sequence<Ice::ShortSeq> ShortSS;
+sequence<Ice::IntSeq> IntSS;
+sequence<Ice::LongSeq> LongSS;
+sequence<Ice::FloatSeq> FloatSS;
+sequence<Ice::DoubleSeq> DoubleSS;
+sequence<Ice::StringSeq> StringSS;
sequence<MyEnumS> MyEnumSS;
sequence<MyClassS> MyClassSS;
@@ -73,14 +67,14 @@ class MyClass
MyClass c;
Object o;
SmallStruct s;
- BoolS seq1;
- ByteS seq2;
- ShortS seq3;
- IntS seq4;
- LongS seq5;
- FloatS seq6;
- DoubleS seq7;
- StringS seq8;
+ Ice::BoolSeq seq1;
+ Ice::ByteSeq seq2;
+ Ice::ShortSeq seq3;
+ Ice::IntSeq seq4;
+ Ice::LongSeq seq5;
+ Ice::FloatSeq seq6;
+ Ice::DoubleSeq seq7;
+ Ice::StringSeq seq8;
MyEnumS seq9;
MyClassS seq10;
StringMyClassD d;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:28:20 +0000