diff options
Diffstat (limited to 'cpp/test/Ice/custom')
| -rw-r--r-- | cpp/test/Ice/custom/AllTests.cpp | 1530 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/Client.cpp | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/Collocated.cpp | 10 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/MyByteSeq.cpp | 6 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/Server.cpp | 10 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/ServerAMD.cpp | 12 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/StringConverterI.cpp | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/StringConverterI.h | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/Test.ice | 10 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/TestAMD.ice | 10 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/TestAMDI.cpp | 130 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/TestAMDI.h | 128 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/TestI.cpp | 98 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/TestI.h | 96 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/WstringAMDI.cpp | 24 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/WstringAMDI.h | 24 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/WstringI.cpp | 20 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/WstringI.h | 20 |
18 files changed, 1070 insertions, 1070 deletions
diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp index 535fe84ffba..e7e70631422 100644 --- a/cpp/test/Ice/custom/AllTests.cpp +++ b/cpp/test/Ice/custom/AllTests.cpp @@ -69,7 +69,7 @@ public: virtual void ice_response(const Test::BoolSeq& ret, const Test::BoolSeq& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -95,18 +95,18 @@ public: } virtual void ice_response(const pair<const Ice::Byte*, const Ice::Byte*>& ret, - const pair<const Ice::Byte*, const Ice::Byte*>& out) + const pair<const Ice::Byte*, const Ice::Byte*>& out) { test(_in.second - _in.first == out.second - out.first); test(_in.second - _in.first == ret.second - ret.first); - Ice::Byte* b = const_cast<Ice::Byte*>(_in.first); - Ice::Byte* r = const_cast<Ice::Byte*>(ret.first); - Ice::Byte* o = const_cast<Ice::Byte*>(out.first); - while(b != _in.second) - { - test(*r++ == *b); - test(*o++ == *b++); - } + Ice::Byte* b = const_cast<Ice::Byte*>(_in.first); + Ice::Byte* r = const_cast<Ice::Byte*>(ret.first); + Ice::Byte* o = const_cast<Ice::Byte*>(out.first); + while(b != _in.second) + { + test(*r++ == *b); + test(*o++ == *b++); + } called(); } @@ -134,7 +134,7 @@ public: virtual void ice_response(const Test::VariableList& ret, const Test::VariableList& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -162,7 +162,7 @@ public: virtual void ice_response(const Test::BoolSeq& ret, const Test::BoolSeq& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -188,18 +188,18 @@ public: } virtual void ice_response(const pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& ret, - const pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& out) + const pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& out) { test(ice_distance(out.first, out.second) == static_cast<Ice::Int>(_in.size())); test(ice_distance(ret.first, ret.second) == static_cast<Ice::Int>(_in.size())); - Test::ByteList::const_iterator b; - Test::ByteList::const_iterator o = out.first; - Test::ByteList::const_iterator r = ret.first; - for(b = _in.begin(); b != _in.end(); ++b) - { - test(*b == *o++); - test(*b == *r++); - } + Test::ByteList::const_iterator b; + Test::ByteList::const_iterator o = out.first; + Test::ByteList::const_iterator r = ret.first; + for(b = _in.begin(); b != _in.end(); ++b) + { + test(*b == *o++); + test(*b == *r++); + } called(); } @@ -227,7 +227,7 @@ public: virtual void ice_response(const Test::VariableList& ret, const Test::VariableList& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -255,7 +255,7 @@ public: virtual void ice_response(const Test::BoolSeq& ret, const Test::BoolSeq& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -283,7 +283,7 @@ public: virtual void ice_response(const Test::ByteList& ret, const Test::ByteList& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -311,7 +311,7 @@ public: virtual void ice_response(const Test::VariableList& ret, const Test::VariableList& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -339,7 +339,7 @@ public: virtual void ice_response(const deque<bool>& ret, const deque<bool>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -367,7 +367,7 @@ public: virtual void ice_response(const list<bool>& ret, const list<bool>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -395,7 +395,7 @@ public: virtual void ice_response(const deque<Ice::Byte>& ret, const deque<Ice::Byte>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -423,7 +423,7 @@ public: virtual void ice_response(const list<Ice::Byte>& ret, const list<Ice::Byte>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -451,7 +451,7 @@ public: virtual void ice_response(const MyByteSeq& ret, const MyByteSeq& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -479,7 +479,7 @@ public: virtual void ice_response(const deque<string>& ret, const deque<string>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -507,7 +507,7 @@ public: virtual void ice_response(const list<string>& ret, const list<string>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -535,7 +535,7 @@ public: virtual void ice_response(const deque<Test::Fixed>& ret, const deque<Test::Fixed>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -563,7 +563,7 @@ public: virtual void ice_response(const list<Test::Fixed>& ret, const list<Test::Fixed>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -591,7 +591,7 @@ public: virtual void ice_response(const deque<Test::Variable>& ret, const deque<Test::Variable>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -619,7 +619,7 @@ public: virtual void ice_response(const list<Test::Variable>& ret, const list<Test::Variable>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -647,7 +647,7 @@ public: virtual void ice_response(const deque<Test::StringStringDict>& ret, const deque<Test::StringStringDict>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -675,7 +675,7 @@ public: virtual void ice_response(const list<Test::StringStringDict>& ret, const list<Test::StringStringDict>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -703,7 +703,7 @@ public: virtual void ice_response(const deque<Test::E>& ret, const deque<Test::E>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -731,7 +731,7 @@ public: virtual void ice_response(const list<Test::E>& ret, const list<Test::E>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -759,7 +759,7 @@ public: virtual void ice_response(const deque<Test::CPrx>& ret, const deque<Test::CPrx>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -787,7 +787,7 @@ public: virtual void ice_response(const list<Test::CPrx>& ret, const list<Test::CPrx>& out) { test(out == _in); - test(ret == _in); + test(ret == _in); called(); } @@ -814,13 +814,13 @@ public: virtual void ice_response(const deque<Test::CPtr>& ret, const deque<Test::CPtr>& out) { - test(out.size() == _in.size()); - test(ret.size() == _in.size()); - for(unsigned int i = 1; i < _in.size(); ++i) - { - test(out[i] == out[0]); - test(ret[i] == out[i]); - } + test(out.size() == _in.size()); + test(ret.size() == _in.size()); + for(unsigned int i = 1; i < _in.size(); ++i) + { + test(out[i] == out[0]); + test(ret[i] == out[i]); + } called(); } @@ -847,14 +847,14 @@ public: virtual void ice_response(const list<Test::CPtr>& ret, const list<Test::CPtr>& out) { - test(out.size() == _in.size()); - test(ret.size() == _in.size()); - list<Test::CPtr>::const_iterator p1; - list<Test::CPtr>::const_iterator p2; - for(p1 = out.begin(), p2 = ret.begin(); p1 != out.end(); ++p1, ++p2) - { - test(*p1 == *p2); - } + test(out.size() == _in.size()); + test(ret.size() == _in.size()); + list<Test::CPtr>::const_iterator p1; + list<Test::CPtr>::const_iterator p2; + for(p1 = out.begin(), p2 = ret.begin(); p1 != out.end(); ++p1, ++p2) + { + test(*p1 == *p2); + } called(); } @@ -875,17 +875,17 @@ class AMI_TestIntf_opClassStructI : public Test::AMI_TestIntf_opClassStruct, pub public: AMI_TestIntf_opClassStructI(const Test::ClassStructPtr& cs, const Test::ClassStructSeq& csseq1) : - _cs(cs), _csseq1(csseq1) + _cs(cs), _csseq1(csseq1) { } virtual void ice_response(const ::Test::ClassStructPtr& ret, - const ::Test::ClassStructPtr& cs1, - const ::Test::ClassStructSeq& seq) + const ::Test::ClassStructPtr& cs1, + const ::Test::ClassStructSeq& seq) { - test(ret == _cs); - test(cs1 == _cs); - test(seq == _csseq1); + test(ret == _cs); + test(cs1 == _cs); + test(seq == _csseq1); called(); } @@ -912,9 +912,9 @@ public: virtual void ice_response(const wstring& ret, const wstring& out) { - test(out == _in); - test(ret == _in); - called(); + test(out == _in); + test(ret == _in); + called(); } virtual void ice_exception(const ::Ice::Exception&) @@ -940,9 +940,9 @@ public: virtual void ice_response(const wstring& ret, const wstring& out) { - test(out == _in); - test(ret == _in); - called(); + test(out == _in); + test(ret == _in); + called(); } virtual void ice_exception(const ::Ice::Exception&) @@ -974,18 +974,18 @@ public: virtual void ice_exception(const ::Ice::Exception& ex) { try - { - ex.ice_throw(); - } - catch(const Test1::WstringException& e) - { - test(e.reason == _in); - called(); - } - catch(...) - { + { + ex.ice_throw(); + } + catch(const Test1::WstringException& e) + { + test(e.reason == _in); + called(); + } + catch(...) + { test(false); - } + } } private: @@ -1012,18 +1012,18 @@ public: virtual void ice_exception(const ::Ice::Exception& ex) { try - { - ex.ice_throw(); - } - catch(const Test2::WstringException& e) - { - test(e.reason == _in); - called(); - } - catch(...) - { + { + ex.ice_throw(); + } + catch(const Test2::WstringException& e) + { + test(e.reason == _in); + called(); + } + catch(...) + { test(false); - } + } } private: @@ -1038,7 +1038,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { cout << "testing stringToProxy... " << flush; string ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.Proxy", "test:default -p 12010 -t 10000"); + "Custom.Proxy", "test:default -p 12010 -t 10000"); Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; @@ -1053,487 +1053,487 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { Test::DoubleSeq in(5); - in[0] = 3.14; - in[1] = 1 / 3; - in[2] = 0.375; - in[3] = 4 / 3; - in[4] = -5.725; - Ice::Double inArray[5]; - for(int i = 0; i < 5; ++i) - { - inArray[i] = in[i]; - } - pair<const Ice::Double*, const Ice::Double*> inPair(inArray, inArray + 5); + in[0] = 3.14; + in[1] = 1 / 3; + in[2] = 0.375; + in[3] = 4 / 3; + in[4] = -5.725; + Ice::Double inArray[5]; + for(int i = 0; i < 5; ++i) + { + inArray[i] = in[i]; + } + pair<const Ice::Double*, const Ice::Double*> inPair(inArray, inArray + 5); - Test::DoubleSeq out; - Test::DoubleSeq ret = t->opDoubleArray(inPair, out); - test(out == in); - test(ret == in); + Test::DoubleSeq out; + Test::DoubleSeq ret = t->opDoubleArray(inPair, out); + test(out == in); + test(ret == in); } { Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - bool inArray[5]; - for(int i = 0; i < 5; ++i) - { - inArray[i] = in[i]; - } - pair<const bool*, const bool*> inPair(inArray, inArray + 5); + in[0] = false; + in[1] = true; + in[2] = true; + in[3] = false; + in[4] = true; + bool inArray[5]; + for(int i = 0; i < 5; ++i) + { + inArray[i] = in[i]; + } + pair<const bool*, const bool*> inPair(inArray, inArray + 5); - Test::BoolSeq out; - Test::BoolSeq ret = t->opBoolArray(inPair, out); - test(out == in); - test(ret == in); + Test::BoolSeq out; + Test::BoolSeq ret = t->opBoolArray(inPair, out); + test(out == in); + test(ret == in); } { Test::ByteList in; - Ice::Byte inArray[5]; - inArray[0] = '1'; - in.push_back(inArray[0]); - inArray[1] = '2'; - in.push_back(inArray[1]); - inArray[2] = '3'; - in.push_back(inArray[2]); - inArray[3] = '4'; - in.push_back(inArray[3]); - inArray[4] = '5'; - in.push_back(inArray[4]); - pair<const Ice::Byte*, const Ice::Byte*> inPair(inArray, inArray + 5); - - Test::ByteList out; - Test::ByteList ret = t->opByteArray(inPair, out); - test(out == in); - test(ret == in); + Ice::Byte inArray[5]; + inArray[0] = '1'; + in.push_back(inArray[0]); + inArray[1] = '2'; + in.push_back(inArray[1]); + inArray[2] = '3'; + in.push_back(inArray[2]); + inArray[3] = '4'; + in.push_back(inArray[3]); + inArray[4] = '5'; + in.push_back(inArray[4]); + pair<const Ice::Byte*, const Ice::Byte*> inPair(inArray, inArray + 5); + + Test::ByteList out; + Test::ByteList ret = t->opByteArray(inPair, out); + test(out == in); + test(ret == in); } { Test::VariableList in; - Test::Variable inArray[5]; - inArray[0].s = "These"; - in.push_back(inArray[0]); - inArray[1].s = "are"; - in.push_back(inArray[1]); - inArray[2].s = "five"; - in.push_back(inArray[2]); - inArray[3].s = "short"; - in.push_back(inArray[3]); - inArray[4].s = "strings."; - in.push_back(inArray[4]); - pair<const Test::Variable*, const Test::Variable*> inPair(inArray, inArray + 5); - - Test::VariableList out; - Test::VariableList ret = t->opVariableArray(inPair, out); - test(out == in); - test(ret == in); + Test::Variable inArray[5]; + inArray[0].s = "These"; + in.push_back(inArray[0]); + inArray[1].s = "are"; + in.push_back(inArray[1]); + inArray[2].s = "five"; + in.push_back(inArray[2]); + inArray[3].s = "short"; + in.push_back(inArray[3]); + inArray[4].s = "strings."; + in.push_back(inArray[4]); + pair<const Test::Variable*, const Test::Variable*> inPair(inArray, inArray + 5); + + Test::VariableList out; + Test::VariableList ret = t->opVariableArray(inPair, out); + test(out == in); + test(ret == in); } { Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator> inPair(in.begin(), in.end()); + in[0] = false; + in[1] = true; + in[2] = true; + in[3] = false; + in[4] = true; + pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator> inPair(in.begin(), in.end()); - Test::BoolSeq out; - Test::BoolSeq ret = t->opBoolRange(inPair, out); - test(out == in); - test(ret == in); + Test::BoolSeq out; + Test::BoolSeq ret = t->opBoolRange(inPair, out); + test(out == in); + test(ret == in); } { Test::ByteList in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); - pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); + in.push_back('1'); + in.push_back('2'); + in.push_back('3'); + in.push_back('4'); + in.push_back('5'); + pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); - Test::ByteList out; - Test::ByteList ret = t->opByteRange(inPair, out); - test(out == in); - test(ret == in); + Test::ByteList out; + Test::ByteList ret = t->opByteRange(inPair, out); + test(out == in); + test(ret == in); } { Test::VariableList in; - Test::Variable v; - v.s = "These"; - in.push_back(v); - v.s = "are"; - in.push_back(v); - v.s = "five"; - in.push_back(v); - v.s = "short"; - in.push_back(v); - v.s = "strings."; - in.push_back(v); - pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator> inPair(in.begin(), in.end()); - - Test::VariableList out; - Test::VariableList ret = t->opVariableRange(inPair, out); - test(out == in); - test(ret == in); + Test::Variable v; + v.s = "These"; + in.push_back(v); + v.s = "are"; + in.push_back(v); + v.s = "five"; + in.push_back(v); + v.s = "short"; + in.push_back(v); + v.s = "strings."; + in.push_back(v); + pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator> inPair(in.begin(), in.end()); + + Test::VariableList out; + Test::VariableList ret = t->opVariableRange(inPair, out); + test(out == in); + test(ret == in); } { Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - bool inArray[5]; - for(int i = 0; i < 5; ++i) - { - inArray[i] = in[i]; - } - pair<const bool*, const bool*> inPair(inArray, inArray + 5); + in[0] = false; + in[1] = true; + in[2] = true; + in[3] = false; + in[4] = true; + bool inArray[5]; + for(int i = 0; i < 5; ++i) + { + inArray[i] = in[i]; + } + pair<const bool*, const bool*> inPair(inArray, inArray + 5); - Test::BoolSeq out; - Test::BoolSeq ret = t->opBoolRangeType(inPair, out); - test(out == in); - test(ret == in); + Test::BoolSeq out; + Test::BoolSeq ret = t->opBoolRangeType(inPair, out); + test(out == in); + test(ret == in); } { Test::ByteList in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); - pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); + in.push_back('1'); + in.push_back('2'); + in.push_back('3'); + in.push_back('4'); + in.push_back('5'); + pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); - Test::ByteList out; - Test::ByteList ret = t->opByteRangeType(inPair, out); - test(out == in); - test(ret == in); + Test::ByteList out; + Test::ByteList ret = t->opByteRangeType(inPair, out); + test(out == in); + test(ret == in); } { Test::VariableList in; - deque<Test::Variable> inSeq; - Test::Variable v; - v.s = "These"; - in.push_back(v); - inSeq.push_back(v); - v.s = "are"; - in.push_back(v); - inSeq.push_back(v); - v.s = "five"; - in.push_back(v); - inSeq.push_back(v); - v.s = "short"; - in.push_back(v); - inSeq.push_back(v); - v.s = "strings."; - in.push_back(v); - inSeq.push_back(v); - pair<deque<Test::Variable>::const_iterator, deque<Test::Variable>::const_iterator> - inPair(inSeq.begin(), inSeq.end()); - - Test::VariableList out; - Test::VariableList ret = t->opVariableRangeType(inPair, out); - test(out == in); - test(ret == in); + deque<Test::Variable> inSeq; + Test::Variable v; + v.s = "These"; + in.push_back(v); + inSeq.push_back(v); + v.s = "are"; + in.push_back(v); + inSeq.push_back(v); + v.s = "five"; + in.push_back(v); + inSeq.push_back(v); + v.s = "short"; + in.push_back(v); + inSeq.push_back(v); + v.s = "strings."; + in.push_back(v); + inSeq.push_back(v); + pair<deque<Test::Variable>::const_iterator, deque<Test::Variable>::const_iterator> + inPair(inSeq.begin(), inSeq.end()); + + Test::VariableList out; + Test::VariableList ret = t->opVariableRangeType(inPair, out); + test(out == in); + test(ret == in); } { deque<bool> in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; + in[0] = false; + in[1] = true; + in[2] = true; + in[3] = false; + in[4] = true; - deque<bool> out; - deque<bool> ret = t->opBoolSeq(in, out); - test(out == in); - test(ret == in); + deque<bool> out; + deque<bool> ret = t->opBoolSeq(in, out); + test(out == in); + test(ret == in); } { list<bool> in; - in.push_back(false); - in.push_back(true); - in.push_back(true); - in.push_back(false); - in.push_back(true); + in.push_back(false); + in.push_back(true); + in.push_back(true); + in.push_back(false); + in.push_back(true); - list<bool> out; - list<bool> ret = t->opBoolList(in, out); - test(out == in); - test(ret == in); + list<bool> out; + list<bool> ret = t->opBoolList(in, out); + test(out == in); + test(ret == in); } { deque< ::Ice::Byte> in(5); - in[0] = '1'; - in[1] = '2'; - in[2] = '3'; - in[3] = '4'; - in[4] = '5'; + in[0] = '1'; + in[1] = '2'; + in[2] = '3'; + in[3] = '4'; + in[4] = '5'; - deque< ::Ice::Byte> out; - deque< ::Ice::Byte> ret = t->opByteSeq(in, out); - test(out == in); - test(ret == in); + deque< ::Ice::Byte> out; + deque< ::Ice::Byte> ret = t->opByteSeq(in, out); + test(out == in); + test(ret == in); } { list< ::Ice::Byte> in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); + in.push_back('1'); + in.push_back('2'); + in.push_back('3'); + in.push_back('4'); + in.push_back('5'); - list< ::Ice::Byte> out; - list< ::Ice::Byte> ret = t->opByteList(in, out); - test(out == in); - test(ret == in); + list< ::Ice::Byte> out; + list< ::Ice::Byte> ret = t->opByteList(in, out); + test(out == in); + test(ret == in); } { MyByteSeq in(5); - int i = 0; - for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p) - { - *p = '1' + i++; - } + int i = 0; + for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p) + { + *p = '1' + i++; + } - MyByteSeq out; - MyByteSeq ret = t->opMyByteSeq(in, out); - test(out == in); - test(ret == in); + MyByteSeq out; + MyByteSeq ret = t->opMyByteSeq(in, out); + test(out == in); + test(ret == in); } { deque<string> in(5); - in[0] = "These"; - in[1] = "are"; - in[2] = "five"; - in[3] = "short"; - in[4] = "strings."; + in[0] = "These"; + in[1] = "are"; + in[2] = "five"; + in[3] = "short"; + in[4] = "strings."; - deque<string> out; - deque<string> ret = t->opStringSeq(in, out); - test(out == in); - test(ret == in); + deque<string> out; + deque<string> ret = t->opStringSeq(in, out); + test(out == in); + test(ret == in); } { list<string> in; - in.push_back("These"); - in.push_back("are"); - in.push_back("five"); - in.push_back("short"); - in.push_back("strings."); + in.push_back("These"); + in.push_back("are"); + in.push_back("five"); + in.push_back("short"); + in.push_back("strings."); - list<string> out; - list<string> ret = t->opStringList(in, out); - test(out == in); - test(ret == in); + list<string> out; + list<string> ret = t->opStringList(in, out); + test(out == in); + test(ret == in); } { deque<Test::Fixed> in(5); - in[0].s = 1; - in[1].s = 2; - in[2].s = 3; - in[3].s = 4; - in[4].s = 5; + in[0].s = 1; + in[1].s = 2; + in[2].s = 3; + in[3].s = 4; + in[4].s = 5; - deque<Test::Fixed> out; - deque<Test::Fixed> ret = t->opFixedSeq(in, out); - test(out == in); - test(ret == in); + deque<Test::Fixed> out; + deque<Test::Fixed> ret = t->opFixedSeq(in, out); + test(out == in); + test(ret == in); } { list<Test::Fixed> in(5); - short num = 1; - for(list<Test::Fixed>::iterator p = in.begin(); p != in.end(); ++p) - { - (*p).s = num++; - } + short num = 1; + for(list<Test::Fixed>::iterator p = in.begin(); p != in.end(); ++p) + { + (*p).s = num++; + } - list<Test::Fixed> out; - list<Test::Fixed> ret = t->opFixedList(in, out); - test(out == in); - test(ret == in); + list<Test::Fixed> out; + list<Test::Fixed> ret = t->opFixedList(in, out); + test(out == in); + test(ret == in); } { deque<Test::Variable> in(5); - in[0].s = "These"; - in[1].s = "are"; - in[2].s = "five"; - in[3].s = "short"; - in[4].s = "strings."; + in[0].s = "These"; + in[1].s = "are"; + in[2].s = "five"; + in[3].s = "short"; + in[4].s = "strings."; - deque<Test::Variable> out; - deque<Test::Variable> ret = t->opVariableSeq(in, out); - test(out == in); - test(ret == in); + deque<Test::Variable> out; + deque<Test::Variable> ret = t->opVariableSeq(in, out); + test(out == in); + test(ret == in); } { list<Test::Variable> in; - Test::Variable v; - v.s = "These"; - in.push_back(v); - v.s = "are"; - in.push_back(v); - v.s = "five"; - in.push_back(v); - v.s = "short"; - in.push_back(v); - v.s = "strings."; - in.push_back(v); + Test::Variable v; + v.s = "These"; + in.push_back(v); + v.s = "are"; + in.push_back(v); + v.s = "five"; + in.push_back(v); + v.s = "short"; + in.push_back(v); + v.s = "strings."; + in.push_back(v); - list<Test::Variable> out; - list<Test::Variable> ret = t->opVariableList(in, out); - test(out == in); - test(ret == in); + list<Test::Variable> out; + list<Test::Variable> ret = t->opVariableList(in, out); + test(out == in); + test(ret == in); } { deque<Test::StringStringDict> in(5); - in[0]["A"] = "a"; - in[1]["B"] = "b"; - in[2]["C"] = "c"; - in[3]["D"] = "d"; - in[4]["E"] = "e"; + in[0]["A"] = "a"; + in[1]["B"] = "b"; + in[2]["C"] = "c"; + in[3]["D"] = "d"; + in[4]["E"] = "e"; - deque<Test::StringStringDict> out; - deque<Test::StringStringDict> ret = t->opStringStringDictSeq(in, out); - test(out == in); - test(ret == in); + deque<Test::StringStringDict> out; + deque<Test::StringStringDict> ret = t->opStringStringDictSeq(in, out); + test(out == in); + test(ret == in); } { list<Test::StringStringDict> in; - Test::StringStringDict ssd; - ssd["A"] = "a"; - in.push_back(ssd); - ssd["B"] = "b"; - in.push_back(ssd); - ssd["C"] = "c"; - in.push_back(ssd); - ssd["D"] = "d"; - in.push_back(ssd); - ssd["E"] = "e"; - in.push_back(ssd); + Test::StringStringDict ssd; + ssd["A"] = "a"; + in.push_back(ssd); + ssd["B"] = "b"; + in.push_back(ssd); + ssd["C"] = "c"; + in.push_back(ssd); + ssd["D"] = "d"; + in.push_back(ssd); + ssd["E"] = "e"; + in.push_back(ssd); - list<Test::StringStringDict> out; - list<Test::StringStringDict> ret = t->opStringStringDictList(in, out); - test(out == in); - test(ret == in); + list<Test::StringStringDict> out; + list<Test::StringStringDict> ret = t->opStringStringDictList(in, out); + test(out == in); + test(ret == in); } { deque<Test::E> in(5); - in[0] = Test::E1; - in[1] = Test::E2; - in[2] = Test::E3; - in[3] = Test::E1; - in[4] = Test::E3; + in[0] = Test::E1; + in[1] = Test::E2; + in[2] = Test::E3; + in[3] = Test::E1; + in[4] = Test::E3; - deque<Test::E> out; - deque<Test::E> ret = t->opESeq(in, out); - test(out == in); - test(ret == in); + deque<Test::E> out; + deque<Test::E> ret = t->opESeq(in, out); + test(out == in); + test(ret == in); } { list<Test::E> in; - in.push_back(Test::E1); - in.push_back(Test::E2); - in.push_back(Test::E3); - in.push_back(Test::E1); - in.push_back(Test::E3); + in.push_back(Test::E1); + in.push_back(Test::E2); + in.push_back(Test::E3); + in.push_back(Test::E1); + in.push_back(Test::E3); - list<Test::E> out; - list<Test::E> ret = t->opEList(in, out); - test(out == in); - test(ret == in); + list<Test::E> out; + list<Test::E> ret = t->opEList(in, out); + test(out == in); + test(ret == in); } { deque<Test::CPrx> in(5); - in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000")); - in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001")); - in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002")); - in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003")); - in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004")); + in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000")); + in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001")); + in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002")); + in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003")); + in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004")); - deque<Test::CPrx> out; - deque<Test::CPrx> ret = t->opCPrxSeq(in, out); - test(out == in); - test(ret == in); + deque<Test::CPrx> out; + deque<Test::CPrx> ret = t->opCPrxSeq(in, out); + test(out == in); + test(ret == in); } { list<Test::CPrx> in; - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004"))); - list<Test::CPrx> out; - list<Test::CPrx> ret = t->opCPrxList(in, out); - test(out == in); - test(ret == in); + list<Test::CPrx> out; + list<Test::CPrx> ret = t->opCPrxList(in, out); + test(out == in); + test(ret == in); } { deque<Test::CPtr> in(5); - in[0] = new Test::C(); - in[1] = in[0]; - in[2] = in[0]; - in[3] = in[0]; - in[4] = in[0]; - - deque<Test::CPtr> out; - deque<Test::CPtr> ret = t->opCSeq(in, out); - test(out.size() == in.size()); - test(ret.size() == in.size()); - for(unsigned int i = 1; i < in.size(); ++i) - { - test(out[i] == out[0]); - test(ret[i] == out[i]); - } + in[0] = new Test::C(); + in[1] = in[0]; + in[2] = in[0]; + in[3] = in[0]; + in[4] = in[0]; + + deque<Test::CPtr> out; + deque<Test::CPtr> ret = t->opCSeq(in, out); + test(out.size() == in.size()); + test(ret.size() == in.size()); + for(unsigned int i = 1; i < in.size(); ++i) + { + test(out[i] == out[0]); + test(ret[i] == out[i]); + } } { list<Test::CPtr> in; - in.push_back(new Test::C()); - in.push_back(new Test::C()); - in.push_back(new Test::C()); - in.push_back(new Test::C()); - in.push_back(new Test::C()); - - list<Test::CPtr> out; - list<Test::CPtr> ret = t->opCList(in, out); - test(out.size() == in.size()); - test(ret.size() == in.size()); - list<Test::CPtr>::const_iterator p1; - list<Test::CPtr>::const_iterator p2; - for(p1 = out.begin(), p2 = ret.begin(); p1 != out.end(); ++p1, ++p2) - { - test(*p1 == *p2); - } + in.push_back(new Test::C()); + in.push_back(new Test::C()); + in.push_back(new Test::C()); + in.push_back(new Test::C()); + in.push_back(new Test::C()); + + list<Test::CPtr> out; + list<Test::CPtr> ret = t->opCList(in, out); + test(out.size() == in.size()); + test(ret.size() == in.size()); + list<Test::CPtr>::const_iterator p1; + list<Test::CPtr>::const_iterator p2; + for(p1 = out.begin(), p2 = ret.begin(); p1 != out.end(); ++p1, ++p2) + { + test(*p1 == *p2); + } } cout << "ok" << endl; @@ -1544,422 +1544,422 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - bool inArray[5]; - for(int i = 0; i < 5; ++i) - { - inArray[i] = in[i]; - } - pair<const bool*, const bool*> inPair(inArray, inArray + 5); - - AMI_TestIntf_opBoolArrayIPtr cb = new AMI_TestIntf_opBoolArrayI(in); - t->opBoolArray_async(cb, inPair); - test(cb->check()); + in[0] = false; + in[1] = true; + in[2] = true; + in[3] = false; + in[4] = true; + bool inArray[5]; + for(int i = 0; i < 5; ++i) + { + inArray[i] = in[i]; + } + pair<const bool*, const bool*> inPair(inArray, inArray + 5); + + AMI_TestIntf_opBoolArrayIPtr cb = new AMI_TestIntf_opBoolArrayI(in); + t->opBoolArray_async(cb, inPair); + test(cb->check()); } { - Ice::Byte in[5]; - in[0] = '1'; - in[1] = '2'; - in[2] = '3'; - in[3] = '4'; - in[4] = '5'; - pair<const Ice::Byte*, const Ice::Byte*> inPair(in, in + 5); - - AMI_TestIntf_opByteArrayIPtr cb = new AMI_TestIntf_opByteArrayI(inPair); - t->opByteArray_async(cb, inPair); - test(cb->check()); + Ice::Byte in[5]; + in[0] = '1'; + in[1] = '2'; + in[2] = '3'; + in[3] = '4'; + in[4] = '5'; + pair<const Ice::Byte*, const Ice::Byte*> inPair(in, in + 5); + + AMI_TestIntf_opByteArrayIPtr cb = new AMI_TestIntf_opByteArrayI(inPair); + t->opByteArray_async(cb, inPair); + test(cb->check()); } { Test::VariableList in; - Test::Variable inArray[5]; - inArray[0].s = "These"; - in.push_back(inArray[0]); - inArray[1].s = "are"; - in.push_back(inArray[1]); - inArray[2].s = "five"; - in.push_back(inArray[2]); - inArray[3].s = "short"; - in.push_back(inArray[3]); - inArray[4].s = "strings."; - in.push_back(inArray[4]); - pair<const Test::Variable*, const Test::Variable*> inPair(inArray, inArray + 5); - - AMI_TestIntf_opVariableArrayIPtr cb = new AMI_TestIntf_opVariableArrayI(in); - t->opVariableArray_async(cb, inPair); - test(cb->check()); + Test::Variable inArray[5]; + inArray[0].s = "These"; + in.push_back(inArray[0]); + inArray[1].s = "are"; + in.push_back(inArray[1]); + inArray[2].s = "five"; + in.push_back(inArray[2]); + inArray[3].s = "short"; + in.push_back(inArray[3]); + inArray[4].s = "strings."; + in.push_back(inArray[4]); + pair<const Test::Variable*, const Test::Variable*> inPair(inArray, inArray + 5); + + AMI_TestIntf_opVariableArrayIPtr cb = new AMI_TestIntf_opVariableArrayI(in); + t->opVariableArray_async(cb, inPair); + test(cb->check()); } { Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator> inPair(in.begin(), in.end()); - - AMI_TestIntf_opBoolRangeIPtr cb = new AMI_TestIntf_opBoolRangeI(in); - t->opBoolRange_async(cb, inPair); - test(cb->check()); + in[0] = false; + in[1] = true; + in[2] = true; + in[3] = false; + in[4] = true; + pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator> inPair(in.begin(), in.end()); + + AMI_TestIntf_opBoolRangeIPtr cb = new AMI_TestIntf_opBoolRangeI(in); + t->opBoolRange_async(cb, inPair); + test(cb->check()); } { Test::ByteList in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); - pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); - - AMI_TestIntf_opByteRangeIPtr cb = new AMI_TestIntf_opByteRangeI(in); - t->opByteRange_async(cb, inPair); - test(cb->check()); + in.push_back('1'); + in.push_back('2'); + in.push_back('3'); + in.push_back('4'); + in.push_back('5'); + pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); + + AMI_TestIntf_opByteRangeIPtr cb = new AMI_TestIntf_opByteRangeI(in); + t->opByteRange_async(cb, inPair); + test(cb->check()); } { Test::VariableList in; - Test::Variable v; - v.s = "These"; - in.push_back(v); - v.s = "are"; - in.push_back(v); - v.s = "five"; - in.push_back(v); - v.s = "short"; - in.push_back(v); - v.s = "strings."; - in.push_back(v); - pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator> inPair(in.begin(), in.end()); - - AMI_TestIntf_opVariableRangeIPtr cb = new AMI_TestIntf_opVariableRangeI(in); - t->opVariableRange_async(cb, inPair); - test(cb->check()); + Test::Variable v; + v.s = "These"; + in.push_back(v); + v.s = "are"; + in.push_back(v); + v.s = "five"; + in.push_back(v); + v.s = "short"; + in.push_back(v); + v.s = "strings."; + in.push_back(v); + pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator> inPair(in.begin(), in.end()); + + AMI_TestIntf_opVariableRangeIPtr cb = new AMI_TestIntf_opVariableRangeI(in); + t->opVariableRange_async(cb, inPair); + test(cb->check()); } { Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - bool inArray[5]; - for(int i = 0; i < 5; ++i) - { - inArray[i] = in[i]; - } - pair<const bool*, const bool*> inPair(inArray, inArray + 5); - - AMI_TestIntf_opBoolRangeTypeIPtr cb = new AMI_TestIntf_opBoolRangeTypeI(in); - t->opBoolRangeType_async(cb, inPair); - test(cb->check()); + in[0] = false; + in[1] = true; + in[2] = true; + in[3] = false; + in[4] = true; + bool inArray[5]; + for(int i = 0; i < 5; ++i) + { + inArray[i] = in[i]; + } + pair<const bool*, const bool*> inPair(inArray, inArray + 5); + + AMI_TestIntf_opBoolRangeTypeIPtr cb = new AMI_TestIntf_opBoolRangeTypeI(in); + t->opBoolRangeType_async(cb, inPair); + test(cb->check()); } { Test::ByteList in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); - pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); - - AMI_TestIntf_opByteRangeTypeIPtr cb = new AMI_TestIntf_opByteRangeTypeI(in); - t->opByteRangeType_async(cb, inPair); - test(cb->check()); + in.push_back('1'); + in.push_back('2'); + in.push_back('3'); + in.push_back('4'); + in.push_back('5'); + pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); + + AMI_TestIntf_opByteRangeTypeIPtr cb = new AMI_TestIntf_opByteRangeTypeI(in); + t->opByteRangeType_async(cb, inPair); + test(cb->check()); } { Test::VariableList in; - deque<Test::Variable> inSeq; - Test::Variable v; - v.s = "These"; - in.push_back(v); - inSeq.push_back(v); - v.s = "are"; - in.push_back(v); - inSeq.push_back(v); - v.s = "five"; - in.push_back(v); - inSeq.push_back(v); - v.s = "short"; - in.push_back(v); - inSeq.push_back(v); - v.s = "strings."; - in.push_back(v); - inSeq.push_back(v); - pair<deque<Test::Variable>::const_iterator, deque<Test::Variable>::const_iterator> - inPair(inSeq.begin(), inSeq.end()); - - AMI_TestIntf_opVariableRangeTypeIPtr cb = new AMI_TestIntf_opVariableRangeTypeI(in); - t->opVariableRangeType_async(cb, inPair); - test(cb->check()); + deque<Test::Variable> inSeq; + Test::Variable v; + v.s = "These"; + in.push_back(v); + inSeq.push_back(v); + v.s = "are"; + in.push_back(v); + inSeq.push_back(v); + v.s = "five"; + in.push_back(v); + inSeq.push_back(v); + v.s = "short"; + in.push_back(v); + inSeq.push_back(v); + v.s = "strings."; + in.push_back(v); + inSeq.push_back(v); + pair<deque<Test::Variable>::const_iterator, deque<Test::Variable>::const_iterator> + inPair(inSeq.begin(), inSeq.end()); + + AMI_TestIntf_opVariableRangeTypeIPtr cb = new AMI_TestIntf_opVariableRangeTypeI(in); + t->opVariableRangeType_async(cb, inPair); + test(cb->check()); } { deque<bool> in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - - AMI_TestIntf_opBoolSeqIPtr cb = new AMI_TestIntf_opBoolSeqI(in); - t->opBoolSeq_async(cb, in); - test(cb->check()); + in[0] = false; + in[1] = true; + in[2] = true; + in[3] = false; + in[4] = true; + + AMI_TestIntf_opBoolSeqIPtr cb = new AMI_TestIntf_opBoolSeqI(in); + t->opBoolSeq_async(cb, in); + test(cb->check()); } { list<bool> in; - in.push_back(false); - in.push_back(true); - in.push_back(true); - in.push_back(false); - in.push_back(true); - - AMI_TestIntf_opBoolListIPtr cb = new AMI_TestIntf_opBoolListI(in); - t->opBoolList_async(cb, in); - test(cb->check()); + in.push_back(false); + in.push_back(true); + in.push_back(true); + in.push_back(false); + in.push_back(true); + + AMI_TestIntf_opBoolListIPtr cb = new AMI_TestIntf_opBoolListI(in); + t->opBoolList_async(cb, in); + test(cb->check()); } { deque< ::Ice::Byte> in(5); - in[0] = '1'; - in[1] = '2'; - in[2] = '3'; - in[3] = '4'; - in[4] = '5'; - - AMI_TestIntf_opByteSeqIPtr cb = new AMI_TestIntf_opByteSeqI(in); - t->opByteSeq_async(cb, in); - test(cb->check()); + in[0] = '1'; + in[1] = '2'; + in[2] = '3'; + in[3] = '4'; + in[4] = '5'; + + AMI_TestIntf_opByteSeqIPtr cb = new AMI_TestIntf_opByteSeqI(in); + t->opByteSeq_async(cb, in); + test(cb->check()); } { list< ::Ice::Byte> in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); - - AMI_TestIntf_opByteListIPtr cb = new AMI_TestIntf_opByteListI(in); - t->opByteList_async(cb, in); - test(cb->check()); + in.push_back('1'); + in.push_back('2'); + in.push_back('3'); + in.push_back('4'); + in.push_back('5'); + + AMI_TestIntf_opByteListIPtr cb = new AMI_TestIntf_opByteListI(in); + t->opByteList_async(cb, in); + test(cb->check()); } { MyByteSeq in(5); - int i = 0; - for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p) - { - *p = '1' + i++; - } - - AMI_TestIntf_opMyByteSeqIPtr cb = new AMI_TestIntf_opMyByteSeqI(in); - t->opMyByteSeq_async(cb, in); - test(cb->check()); + int i = 0; + for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p) + { + *p = '1' + i++; + } + + AMI_TestIntf_opMyByteSeqIPtr cb = new AMI_TestIntf_opMyByteSeqI(in); + t->opMyByteSeq_async(cb, in); + test(cb->check()); } { deque<string> in(5); - in[0] = "These"; - in[1] = "are"; - in[2] = "five"; - in[3] = "short"; - in[4] = "strings."; - - AMI_TestIntf_opStringSeqIPtr cb = new AMI_TestIntf_opStringSeqI(in); - t->opStringSeq_async(cb, in); - test(cb->check()); + in[0] = "These"; + in[1] = "are"; + in[2] = "five"; + in[3] = "short"; + in[4] = "strings."; + + AMI_TestIntf_opStringSeqIPtr cb = new AMI_TestIntf_opStringSeqI(in); + t->opStringSeq_async(cb, in); + test(cb->check()); } { list<string> in; - in.push_back("These"); - in.push_back("are"); - in.push_back("five"); - in.push_back("short"); - in.push_back("strings."); - - AMI_TestIntf_opStringListIPtr cb = new AMI_TestIntf_opStringListI(in); - t->opStringList_async(cb, in); - test(cb->check()); + in.push_back("These"); + in.push_back("are"); + in.push_back("five"); + in.push_back("short"); + in.push_back("strings."); + + AMI_TestIntf_opStringListIPtr cb = new AMI_TestIntf_opStringListI(in); + t->opStringList_async(cb, in); + test(cb->check()); } { deque<Test::Fixed> in(5); - in[0].s = 1; - in[1].s = 2; - in[2].s = 3; - in[3].s = 4; - in[4].s = 5; - - AMI_TestIntf_opFixedSeqIPtr cb = new AMI_TestIntf_opFixedSeqI(in); - t->opFixedSeq_async(cb, in); - test(cb->check()); + in[0].s = 1; + in[1].s = 2; + in[2].s = 3; + in[3].s = 4; + in[4].s = 5; + + AMI_TestIntf_opFixedSeqIPtr cb = new AMI_TestIntf_opFixedSeqI(in); + t->opFixedSeq_async(cb, in); + test(cb->check()); } { list<Test::Fixed> in(5); - short num = 1; - for(list<Test::Fixed>::iterator p = in.begin(); p != in.end(); ++p) - { - (*p).s = num++; - } - - AMI_TestIntf_opFixedListIPtr cb = new AMI_TestIntf_opFixedListI(in); - t->opFixedList_async(cb, in); - test(cb->check()); + short num = 1; + for(list<Test::Fixed>::iterator p = in.begin(); p != in.end(); ++p) + { + (*p).s = num++; + } + + AMI_TestIntf_opFixedListIPtr cb = new AMI_TestIntf_opFixedListI(in); + t->opFixedList_async(cb, in); + test(cb->check()); } { deque<Test::Variable> in(5); - in[0].s = "These"; - in[1].s = "are"; - in[2].s = "five"; - in[3].s = "short"; - in[4].s = "strings."; - - AMI_TestIntf_opVariableSeqIPtr cb = new AMI_TestIntf_opVariableSeqI(in); - t->opVariableSeq_async(cb, in); - test(cb->check()); + in[0].s = "These"; + in[1].s = "are"; + in[2].s = "five"; + in[3].s = "short"; + in[4].s = "strings."; + + AMI_TestIntf_opVariableSeqIPtr cb = new AMI_TestIntf_opVariableSeqI(in); + t->opVariableSeq_async(cb, in); + test(cb->check()); } { list<Test::Variable> in; - Test::Variable v; - v.s = "These"; - in.push_back(v); - v.s = "are"; - in.push_back(v); - v.s = "five"; - in.push_back(v); - v.s = "short"; - in.push_back(v); - v.s = "strings."; - in.push_back(v); - - AMI_TestIntf_opVariableListIPtr cb = new AMI_TestIntf_opVariableListI(in); - t->opVariableList_async(cb, in); - test(cb->check()); + Test::Variable v; + v.s = "These"; + in.push_back(v); + v.s = "are"; + in.push_back(v); + v.s = "five"; + in.push_back(v); + v.s = "short"; + in.push_back(v); + v.s = "strings."; + in.push_back(v); + + AMI_TestIntf_opVariableListIPtr cb = new AMI_TestIntf_opVariableListI(in); + t->opVariableList_async(cb, in); + test(cb->check()); } { deque<Test::StringStringDict> in(5); - in[0]["A"] = "a"; - in[1]["B"] = "b"; - in[2]["C"] = "c"; - in[3]["D"] = "d"; - in[4]["E"] = "e"; - - AMI_TestIntf_opStringStringDictSeqIPtr cb = new AMI_TestIntf_opStringStringDictSeqI(in); - t->opStringStringDictSeq_async(cb, in); - test(cb->check()); + in[0]["A"] = "a"; + in[1]["B"] = "b"; + in[2]["C"] = "c"; + in[3]["D"] = "d"; + in[4]["E"] = "e"; + + AMI_TestIntf_opStringStringDictSeqIPtr cb = new AMI_TestIntf_opStringStringDictSeqI(in); + t->opStringStringDictSeq_async(cb, in); + test(cb->check()); } { list<Test::StringStringDict> in; - Test::StringStringDict ssd; - ssd["A"] = "a"; - in.push_back(ssd); - ssd["B"] = "b"; - in.push_back(ssd); - ssd["C"] = "c"; - in.push_back(ssd); - ssd["D"] = "d"; - in.push_back(ssd); - ssd["E"] = "e"; - in.push_back(ssd); - - AMI_TestIntf_opStringStringDictListIPtr cb = new AMI_TestIntf_opStringStringDictListI(in); - t->opStringStringDictList_async(cb, in); - test(cb->check()); + Test::StringStringDict ssd; + ssd["A"] = "a"; + in.push_back(ssd); + ssd["B"] = "b"; + in.push_back(ssd); + ssd["C"] = "c"; + in.push_back(ssd); + ssd["D"] = "d"; + in.push_back(ssd); + ssd["E"] = "e"; + in.push_back(ssd); + + AMI_TestIntf_opStringStringDictListIPtr cb = new AMI_TestIntf_opStringStringDictListI(in); + t->opStringStringDictList_async(cb, in); + test(cb->check()); } { deque<Test::E> in(5); - in[0] = Test::E1; - in[1] = Test::E2; - in[2] = Test::E3; - in[3] = Test::E1; - in[4] = Test::E3; - - AMI_TestIntf_opESeqIPtr cb = new AMI_TestIntf_opESeqI(in); - t->opESeq_async(cb, in); - test(cb->check()); + in[0] = Test::E1; + in[1] = Test::E2; + in[2] = Test::E3; + in[3] = Test::E1; + in[4] = Test::E3; + + AMI_TestIntf_opESeqIPtr cb = new AMI_TestIntf_opESeqI(in); + t->opESeq_async(cb, in); + test(cb->check()); } { list<Test::E> in; - in.push_back(Test::E1); - in.push_back(Test::E2); - in.push_back(Test::E3); - in.push_back(Test::E1); - in.push_back(Test::E3); - - AMI_TestIntf_opEListIPtr cb = new AMI_TestIntf_opEListI(in); - t->opEList_async(cb, in); - test(cb->check()); + in.push_back(Test::E1); + in.push_back(Test::E2); + in.push_back(Test::E3); + in.push_back(Test::E1); + in.push_back(Test::E3); + + AMI_TestIntf_opEListIPtr cb = new AMI_TestIntf_opEListI(in); + t->opEList_async(cb, in); + test(cb->check()); } { deque<Test::CPrx> in(5); - in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000")); - in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001")); - in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002")); - in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003")); - in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004")); - - AMI_TestIntf_opCPrxSeqIPtr cb = new AMI_TestIntf_opCPrxSeqI(in); - t->opCPrxSeq_async(cb, in); - test(cb->check()); + in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000")); + in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001")); + in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002")); + in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003")); + in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004")); + + AMI_TestIntf_opCPrxSeqIPtr cb = new AMI_TestIntf_opCPrxSeqI(in); + t->opCPrxSeq_async(cb, in); + test(cb->check()); } { list<Test::CPrx> in; - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004"))); - - AMI_TestIntf_opCPrxListIPtr cb = new AMI_TestIntf_opCPrxListI(in); - t->opCPrxList_async(cb, in); - test(cb->check()); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003"))); + in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004"))); + + AMI_TestIntf_opCPrxListIPtr cb = new AMI_TestIntf_opCPrxListI(in); + t->opCPrxList_async(cb, in); + test(cb->check()); } { deque<Test::CPtr> in(5); - in[0] = new Test::C(); - in[1] = in[0]; - in[2] = in[0]; - in[3] = in[0]; - in[4] = in[0]; - - AMI_TestIntf_opCSeqIPtr cb = new AMI_TestIntf_opCSeqI(in); - t->opCSeq_async(cb, in); - test(cb->check()); + in[0] = new Test::C(); + in[1] = in[0]; + in[2] = in[0]; + in[3] = in[0]; + in[4] = in[0]; + + AMI_TestIntf_opCSeqIPtr cb = new AMI_TestIntf_opCSeqI(in); + t->opCSeq_async(cb, in); + test(cb->check()); } { list<Test::CPtr> in; - in.push_back(new Test::C()); - in.push_back(new Test::C()); - in.push_back(new Test::C()); - in.push_back(new Test::C()); - in.push_back(new Test::C()); - - AMI_TestIntf_opCListIPtr cb = new AMI_TestIntf_opCListI(in); - t->opCList_async(cb, in); - test(cb->check()); + in.push_back(new Test::C()); + in.push_back(new Test::C()); + in.push_back(new Test::C()); + in.push_back(new Test::C()); + in.push_back(new Test::C()); + + AMI_TestIntf_opCListIPtr cb = new AMI_TestIntf_opCListI(in); + t->opCList_async(cb, in); + test(cb->check()); } cout << "ok" << endl; @@ -1987,10 +1987,10 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) if(!collocated) { cout << "testing class mapped structs with AMI... " << flush; - AMI_TestIntf_opClassStructIPtr cb = new AMI_TestIntf_opClassStructI(cs, csseq1); - t->opClassStruct_async(cb, cs, csseq1); - test(cb->check()); - cout << "ok" << endl; + AMI_TestIntf_opClassStructIPtr cb = new AMI_TestIntf_opClassStructI(cs, csseq1); + t->opClassStruct_async(cb, cs, csseq1); + test(cb->check()); + cout << "ok" << endl; } cout << "testing wstring... " << flush; @@ -2008,14 +2008,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) wdict2 = wdict1; ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.WstringProxy1", "wstring1:default -p 12010 -t 10000"); + "Custom.WstringProxy1", "wstring1:default -p 12010 -t 10000"); base = communicator->stringToProxy(ref); test(base); Test1::WstringClassPrx wsc1 = Test1::WstringClassPrx::checkedCast(base); test(t); ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.WstringProxy2", "wstring2:default -p 12010 -t 10000"); + "Custom.WstringProxy2", "wstring2:default -p 12010 -t 10000"); base = communicator->stringToProxy(ref); test(base); Test2::WstringClassPrx wsc2 = Test2::WstringClassPrx::checkedCast(base); @@ -2029,9 +2029,9 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) if(!collocated) { - AMI_Test1_opStringIPtr cb = new AMI_Test1_opStringI(wstr); - wsc1->opString_async(cb, wstr); - test(cb->check()); + AMI_Test1_opStringIPtr cb = new AMI_Test1_opStringI(wstr); + wsc1->opString_async(cb, wstr); + test(cb->check()); } ret = wsc2->opString(wstr, out); @@ -2040,9 +2040,9 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) if(!collocated) { - AMI_Test2_opStringIPtr cb = new AMI_Test2_opStringI(wstr); - wsc2->opString_async(cb, wstr); - test(cb->check()); + AMI_Test2_opStringIPtr cb = new AMI_Test2_opStringI(wstr); + wsc2->opString_async(cb, wstr); + test(cb->check()); } Test1::WstringStruct wss1; @@ -2070,9 +2070,9 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) if(!collocated) { - AMI_Test1_throwExceptIPtr cb = new AMI_Test1_throwExceptI(wstr); - wsc1->throwExcept_async(cb, wstr); - test(cb->check()); + AMI_Test1_throwExceptIPtr cb = new AMI_Test1_throwExceptI(wstr); + wsc1->throwExcept_async(cb, wstr); + test(cb->check()); } try @@ -2086,9 +2086,9 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) if(!collocated) { - AMI_Test2_throwExceptIPtr cb = new AMI_Test2_throwExceptI(wstr); - wsc2->throwExcept_async(cb, wstr); - test(cb->check()); + AMI_Test2_throwExceptIPtr cb = new AMI_Test2_throwExceptI(wstr); + wsc2->throwExcept_async(cb, wstr); + test(cb->check()); } cout << "ok" << endl; diff --git a/cpp/test/Ice/custom/Client.cpp b/cpp/test/Ice/custom/Client.cpp index 14e524cc20e..6241f91a320 100644 --- a/cpp/test/Ice/custom/Client.cpp +++ b/cpp/test/Ice/custom/Client.cpp @@ -33,8 +33,8 @@ main(int argc, char** argv) try { Ice::InitializationData initData; - initData.stringConverter = new Test::StringConverterI(); - initData.wstringConverter = new Test::WstringConverterI(); + initData.stringConverter = new Test::StringConverterI(); + initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index fea1ce2681a..b7da06a2c82 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -38,11 +38,11 @@ main(int argc, char** argv) try { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); - initData.stringConverter = new Test::StringConverterI(); - initData.wstringConverter = new Test::WstringConverterI(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(argc, argv); + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.stringConverter = new Test::StringConverterI(); + initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/custom/MyByteSeq.cpp b/cpp/test/Ice/custom/MyByteSeq.cpp index de8306692cc..0fcdf2b4f74 100644 --- a/cpp/test/Ice/custom/MyByteSeq.cpp +++ b/cpp/test/Ice/custom/MyByteSeq.cpp @@ -31,7 +31,7 @@ MyByteSeq::MyByteSeq(const MyByteSeq& seq) if(_size != 0) { _data = (Ice::Byte*)malloc(_size); - memcpy(_data, seq._data, _size); + memcpy(_data, seq._data, _size); } else { @@ -82,13 +82,13 @@ MyByteSeq::operator=(const MyByteSeq& rhs) if(_data != 0) { free(_data); - _data = 0; + _data = 0; } _size = rhs._size; if(_size != 0) { _data = (Ice::Byte*)malloc(_size); - memcpy(_data, rhs._data, _size); + memcpy(_data, rhs._data, _size); } } diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index 0e3925e6c08..15ef0f01bf9 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -37,11 +37,11 @@ main(int argc, char** argv) try { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); - initData.stringConverter = new Test::StringConverterI(); - initData.wstringConverter = new Test::WstringConverterI(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(argc, argv); + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.stringConverter = new Test::StringConverterI(); + initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index 92c0fad867c..d4ccd779899 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -37,12 +37,12 @@ main(int argc, char** argv) try { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); - - initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); - initData.stringConverter = new Test::StringConverterI(); - initData.wstringConverter = new Test::WstringConverterI(); + Ice::InitializationData initData; + initData.properties = Ice::createProperties(argc, argv); + + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.stringConverter = new Test::StringConverterI(); + initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); } diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp index f3798ad5db5..626a3626476 100644 --- a/cpp/test/Ice/custom/StringConverterI.cpp +++ b/cpp/test/Ice/custom/StringConverterI.cpp @@ -30,7 +30,7 @@ Test::StringConverterI::toUTF8(const char* sourceStart, const char* sourceEnd, I void Test::StringConverterI::fromUTF8(const Ice::Byte* sourceStart, const Ice::Byte* sourceEnd, - string& target) const + string& target) const { size_t size = static_cast<size_t>(sourceEnd - sourceStart); target.resize(size); @@ -63,7 +63,7 @@ Test::WstringConverterI::toUTF8(const wchar_t* sourceStart, const wchar_t* sourc void Test::WstringConverterI::fromUTF8(const Ice::Byte* sourceStart, const Ice::Byte* sourceEnd, - wstring& target) const + wstring& target) const { size_t size = static_cast<size_t>(sourceEnd - sourceStart); string s; diff --git a/cpp/test/Ice/custom/StringConverterI.h b/cpp/test/Ice/custom/StringConverterI.h index 6d555358398..9a2d63cfd9b 100644 --- a/cpp/test/Ice/custom/StringConverterI.h +++ b/cpp/test/Ice/custom/StringConverterI.h @@ -26,7 +26,7 @@ public: virtual Ice::Byte* toUTF8(const char*, const char*, Ice::UTF8Buffer&) const; virtual void fromUTF8(const Ice::Byte* sourceStart, const Ice::Byte* sourceEnd, - std::string& target) const; + std::string& target) const; }; class WstringConverterI : public Ice::WstringConverter @@ -35,7 +35,7 @@ public: virtual Ice::Byte* toUTF8(const wchar_t*, const wchar_t*, Ice::UTF8Buffer&) const; virtual void fromUTF8(const Ice::Byte* sourceStart, const Ice::Byte* sourceEnd, - std::wstring& target) const; + std::wstring& target) const; }; diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice index baa8cceb1e3..ec21d2d7802 100644 --- a/cpp/test/Ice/custom/Test.ice +++ b/cpp/test/Ice/custom/Test.ice @@ -139,7 +139,7 @@ sequence<ClassStruct> ClassStructSeq; ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq opByteSeq(["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq inSeq, - out ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq outSeq); + out ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq outSeq); ByteList opByteList(ByteList inSeq, out ByteList outSeq); @@ -148,7 +148,7 @@ sequence<ClassStruct> ClassStructSeq; ["cpp:type:std::deque<std::string>"] StringSeq opStringSeq(["cpp:type:std::deque<std::string>"] StringSeq inSeq, - out ["cpp:type:std::deque<std::string>"] StringSeq outSeq); + out ["cpp:type:std::deque<std::string>"] StringSeq outSeq); StringList opStringList(StringList inSeq, out StringList outSeq); @@ -160,13 +160,13 @@ sequence<ClassStruct> ClassStructSeq; ["cpp:type:std::deque< ::Test::Variable>"] VariableSeq opVariableSeq(["cpp:type:std::deque< ::Test::Variable>"] VariableSeq inSeq, - out ["cpp:type:std::deque< ::Test::Variable>"] VariableSeq outSeq); + out ["cpp:type:std::deque< ::Test::Variable>"] VariableSeq outSeq); VariableList opVariableList(VariableList inSeq, out VariableList outSeq); ["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq opStringStringDictSeq(["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq inSeq, - out ["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq outSeq); + out ["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq outSeq); StringStringDictList opStringStringDictList(StringStringDictList inSeq, out StringStringDictList outSeq); @@ -177,7 +177,7 @@ sequence<ClassStruct> ClassStructSeq; ["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq opCPrxSeq(["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq inSeq, - out ["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq outSeq); + out ["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq outSeq); CPrxList opCPrxList(CPrxList inSeq, out CPrxList outSeq); diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice index 736131296fe..b0c8383855b 100644 --- a/cpp/test/Ice/custom/TestAMD.ice +++ b/cpp/test/Ice/custom/TestAMD.ice @@ -139,7 +139,7 @@ sequence<ClassStruct> ClassStructSeq; ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq opByteSeq(["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq inSeq, - out ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq outSeq); + out ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq outSeq); ByteList opByteList(ByteList inSeq, out ByteList outSeq); @@ -148,7 +148,7 @@ sequence<ClassStruct> ClassStructSeq; ["cpp:type:std::deque<std::string>"] StringSeq opStringSeq(["cpp:type:std::deque<std::string>"] StringSeq inSeq, - out ["cpp:type:std::deque<std::string>"] StringSeq outSeq); + out ["cpp:type:std::deque<std::string>"] StringSeq outSeq); StringList opStringList(StringList inSeq, out StringList outSeq); @@ -160,13 +160,13 @@ sequence<ClassStruct> ClassStructSeq; ["cpp:type:std::deque< ::Test::Variable>"] VariableSeq opVariableSeq(["cpp:type:std::deque< ::Test::Variable>"] VariableSeq inSeq, - out ["cpp:type:std::deque< ::Test::Variable>"] VariableSeq outSeq); + out ["cpp:type:std::deque< ::Test::Variable>"] VariableSeq outSeq); VariableList opVariableList(VariableList inSeq, out VariableList outSeq); ["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq opStringStringDictSeq(["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq inSeq, - out ["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq outSeq); + out ["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq outSeq); StringStringDictList opStringStringDictList(StringStringDictList inSeq, out StringStringDictList outSeq); @@ -177,7 +177,7 @@ sequence<ClassStruct> ClassStructSeq; ["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq opCPrxSeq(["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq inSeq, - out ["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq outSeq); + out ["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq outSeq); CPrxList opCPrxList(CPrxList inSeq, out CPrxList outSeq); diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp index b7c4cd26c79..e323194c210 100644 --- a/cpp/test/Ice/custom/TestAMDI.cpp +++ b/cpp/test/Ice/custom/TestAMDI.cpp @@ -17,8 +17,8 @@ TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator) void TestIntfI::opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr& opDoubleArrayCB, - const std::pair<const Ice::Double*, const Ice::Double*>& inSeq, - const Ice::Current& current) + const std::pair<const Ice::Double*, const Ice::Double*>& inSeq, + const Ice::Current& current) { Test::DoubleSeq outSeq(inSeq.first, inSeq.second); opDoubleArrayCB->ice_response(outSeq, outSeq); @@ -26,8 +26,8 @@ TestIntfI::opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr& opDoub void TestIntfI::opBoolArray_async(const Test::AMD_TestIntf_opBoolArrayPtr& opBoolArrayCB, - const std::pair<const bool*, const bool*>& inSeq, - const Ice::Current& current) + const std::pair<const bool*, const bool*>& inSeq, + const Ice::Current& current) { Test::BoolSeq outSeq(inSeq.first, inSeq.second); opBoolArrayCB->ice_response(outSeq, outSeq); @@ -35,16 +35,16 @@ TestIntfI::opBoolArray_async(const Test::AMD_TestIntf_opBoolArrayPtr& opBoolArra void TestIntfI::opByteArray_async(const Test::AMD_TestIntf_opByteArrayPtr& opByteArrayCB, - const std::pair<const Ice::Byte*, const Ice::Byte*>& inSeq, - const Ice::Current& current) + const std::pair<const Ice::Byte*, const Ice::Byte*>& inSeq, + const Ice::Current& current) { opByteArrayCB->ice_response(inSeq, inSeq); } void TestIntfI::opVariableArray_async(const Test::AMD_TestIntf_opVariableArrayPtr& opVariableArrayCB, - const std::pair<const Test::Variable*, const Test::Variable*>& inSeq, - const Ice::Current& current) + const std::pair<const Test::Variable*, const Test::Variable*>& inSeq, + const Ice::Current& current) { Test::VariableList outSeq(inSeq.first, inSeq.second); opVariableArrayCB->ice_response(outSeq, outSeq); @@ -52,8 +52,8 @@ TestIntfI::opVariableArray_async(const Test::AMD_TestIntf_opVariableArrayPtr& op void TestIntfI::opBoolRange_async(const Test::AMD_TestIntf_opBoolRangePtr& opBoolRangeCB, - const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>& inSeq, - const Ice::Current& current) + const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>& inSeq, + const Ice::Current& current) { Test::BoolSeq outSeq(inSeq.first, inSeq.second); opBoolRangeCB->ice_response(outSeq, outSeq); @@ -61,17 +61,17 @@ TestIntfI::opBoolRange_async(const Test::AMD_TestIntf_opBoolRangePtr& opBoolRang void TestIntfI::opByteRange_async(const Test::AMD_TestIntf_opByteRangePtr& opByteRangeCB, - const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, - const Ice::Current& current) + const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, + const Ice::Current& current) { opByteRangeCB->ice_response(inSeq, inSeq); } void TestIntfI::opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr& opVariableRangeCB, - const std::pair<Test::VariableList::const_iterator, - Test::VariableList::const_iterator>& inSeq, - const Ice::Current& current) + const std::pair<Test::VariableList::const_iterator, + Test::VariableList::const_iterator>& inSeq, + const Ice::Current& current) { Test::VariableList outSeq(inSeq.first, inSeq.second); opVariableRangeCB->ice_response(outSeq, outSeq); @@ -79,8 +79,8 @@ TestIntfI::opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr& op void TestIntfI::opBoolRangeType_async(const Test::AMD_TestIntf_opBoolRangeTypePtr& opBoolRangeTypeCB, - const std::pair<const bool*, const bool*>& inSeq, - const Ice::Current& current) + const std::pair<const bool*, const bool*>& inSeq, + const Ice::Current& current) { Test::BoolSeq outSeq(inSeq.first, inSeq.second); opBoolRangeTypeCB->ice_response(outSeq, outSeq); @@ -88,8 +88,8 @@ TestIntfI::opBoolRangeType_async(const Test::AMD_TestIntf_opBoolRangeTypePtr& op void TestIntfI::opByteRangeType_async(const Test::AMD_TestIntf_opByteRangeTypePtr& opByteRangeTypeCB, - const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, - const Ice::Current& current) + const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, + const Ice::Current& current) { Test::ByteList outSeq(inSeq.first, inSeq.second); opByteRangeTypeCB->ice_response(outSeq, outSeq); @@ -97,22 +97,22 @@ TestIntfI::opByteRangeType_async(const Test::AMD_TestIntf_opByteRangeTypePtr& op void TestIntfI::opVariableRangeType_async(const Test::AMD_TestIntf_opVariableRangeTypePtr& opVariableRangeTypeCB, - const std::pair<std::deque<Test::Variable>::const_iterator, - std::deque<Test::Variable>::const_iterator>& inSeq, - const Ice::Current& current) + const std::pair<std::deque<Test::Variable>::const_iterator, + std::deque<Test::Variable>::const_iterator>& inSeq, + const Ice::Current& current) { Test::VariableList outSeq; for(std::deque<Test::Variable>::const_iterator p = inSeq.first; p != inSeq.second; ++p) { - outSeq.push_back(*p); + outSeq.push_back(*p); } opVariableRangeTypeCB->ice_response(outSeq, outSeq); } void TestIntfI::opBoolSeq_async(const Test::AMD_TestIntf_opBoolSeqPtr& opBoolSeqCB, - const std::deque<bool>& inSeq, - const Ice::Current& current) + const std::deque<bool>& inSeq, + const Ice::Current& current) { std::deque<bool> outSeq(inSeq); opBoolSeqCB->ice_response(outSeq, outSeq); @@ -120,8 +120,8 @@ TestIntfI::opBoolSeq_async(const Test::AMD_TestIntf_opBoolSeqPtr& opBoolSeqCB, void TestIntfI::opBoolList_async(const Test::AMD_TestIntf_opBoolListPtr& opBoolListCB, - const Test::BoolList& inSeq, - const Ice::Current& current) + const Test::BoolList& inSeq, + const Ice::Current& current) { Test::BoolList outSeq(inSeq); opBoolListCB->ice_response(outSeq, outSeq); @@ -129,8 +129,8 @@ TestIntfI::opBoolList_async(const Test::AMD_TestIntf_opBoolListPtr& opBoolListCB void TestIntfI::opByteSeq_async(const Test::AMD_TestIntf_opByteSeqPtr& opByteSeqCB, - const std::deque<Ice::Byte>& inSeq, - const Ice::Current& current) + const std::deque<Ice::Byte>& inSeq, + const Ice::Current& current) { std::deque<Ice::Byte> outSeq(inSeq); opByteSeqCB->ice_response(outSeq, outSeq); @@ -138,8 +138,8 @@ TestIntfI::opByteSeq_async(const Test::AMD_TestIntf_opByteSeqPtr& opByteSeqCB, void TestIntfI::opByteList_async(const Test::AMD_TestIntf_opByteListPtr& opByteListCB, - const Test::ByteList& inSeq, - const Ice::Current& current) + const Test::ByteList& inSeq, + const Ice::Current& current) { Test::ByteList outSeq(inSeq); opByteListCB->ice_response(outSeq, outSeq); @@ -147,8 +147,8 @@ TestIntfI::opByteList_async(const Test::AMD_TestIntf_opByteListPtr& opByteListCB void TestIntfI::opMyByteSeq_async(const Test::AMD_TestIntf_opMyByteSeqPtr& opMyByteSeqCB, - const MyByteSeq& inSeq, - const Ice::Current& current) + const MyByteSeq& inSeq, + const Ice::Current& current) { MyByteSeq outSeq(inSeq); opMyByteSeqCB->ice_response(outSeq, outSeq); @@ -156,8 +156,8 @@ TestIntfI::opMyByteSeq_async(const Test::AMD_TestIntf_opMyByteSeqPtr& opMyByteSe void TestIntfI::opStringSeq_async(const Test::AMD_TestIntf_opStringSeqPtr& opStringSeqCB, - const std::deque<std::string>& inSeq, - const Ice::Current& current) + const std::deque<std::string>& inSeq, + const Ice::Current& current) { std::deque<std::string> outSeq(inSeq); opStringSeqCB->ice_response(outSeq, outSeq); @@ -165,8 +165,8 @@ TestIntfI::opStringSeq_async(const Test::AMD_TestIntf_opStringSeqPtr& opStringSe void TestIntfI::opStringList_async(const Test::AMD_TestIntf_opStringListPtr& opStringListCB, - const Test::StringList& inSeq, - const Ice::Current& current) + const Test::StringList& inSeq, + const Ice::Current& current) { Test::StringList outSeq(inSeq); opStringListCB->ice_response(outSeq, outSeq); @@ -174,8 +174,8 @@ TestIntfI::opStringList_async(const Test::AMD_TestIntf_opStringListPtr& opString void TestIntfI::opFixedSeq_async(const Test::AMD_TestIntf_opFixedSeqPtr& opFixedSeqCB, - const std::deque<Test::Fixed>& inSeq, - const Ice::Current& current) + const std::deque<Test::Fixed>& inSeq, + const Ice::Current& current) { std::deque<Test::Fixed> outSeq(inSeq); opFixedSeqCB->ice_response(outSeq, outSeq); @@ -183,8 +183,8 @@ TestIntfI::opFixedSeq_async(const Test::AMD_TestIntf_opFixedSeqPtr& opFixedSeqCB void TestIntfI::opFixedList_async(const Test::AMD_TestIntf_opFixedListPtr& opFixedListCB, - const Test::FixedList& inSeq, - const Ice::Current& current) + const Test::FixedList& inSeq, + const Ice::Current& current) { Test::FixedList outSeq(inSeq); opFixedListCB->ice_response(outSeq, outSeq); @@ -192,8 +192,8 @@ TestIntfI::opFixedList_async(const Test::AMD_TestIntf_opFixedListPtr& opFixedLis void TestIntfI::opVariableSeq_async(const Test::AMD_TestIntf_opVariableSeqPtr& opVariableSeqCB, - const std::deque<Test::Variable>& inSeq, - const Ice::Current& current) + const std::deque<Test::Variable>& inSeq, + const Ice::Current& current) { std::deque<Test::Variable> outSeq(inSeq); opVariableSeqCB->ice_response(outSeq, outSeq); @@ -201,8 +201,8 @@ TestIntfI::opVariableSeq_async(const Test::AMD_TestIntf_opVariableSeqPtr& opVari void TestIntfI::opVariableList_async(const Test::AMD_TestIntf_opVariableListPtr& opVariableListCB, - const Test::VariableList& inSeq, - const Ice::Current& current) + const Test::VariableList& inSeq, + const Ice::Current& current) { Test::VariableList outSeq(inSeq); opVariableListCB->ice_response(outSeq, outSeq); @@ -210,8 +210,8 @@ TestIntfI::opVariableList_async(const Test::AMD_TestIntf_opVariableListPtr& opVa void TestIntfI::opStringStringDictSeq_async(const Test::AMD_TestIntf_opStringStringDictSeqPtr& opStringStringDictSeqCB, - const std::deque<Test::StringStringDict>& inSeq, - const Ice::Current& current) + const std::deque<Test::StringStringDict>& inSeq, + const Ice::Current& current) { std::deque<Test::StringStringDict> outSeq(inSeq); opStringStringDictSeqCB->ice_response(outSeq, outSeq); @@ -219,8 +219,8 @@ TestIntfI::opStringStringDictSeq_async(const Test::AMD_TestIntf_opStringStringDi void TestIntfI::opStringStringDictList_async(const Test::AMD_TestIntf_opStringStringDictListPtr& opStringStringDictListCB, - const Test::StringStringDictList& inSeq, - const Ice::Current& current) + const Test::StringStringDictList& inSeq, + const Ice::Current& current) { Test::StringStringDictList outSeq(inSeq); opStringStringDictListCB->ice_response(outSeq, outSeq); @@ -228,8 +228,8 @@ TestIntfI::opStringStringDictList_async(const Test::AMD_TestIntf_opStringStringD void TestIntfI::opESeq_async(const Test::AMD_TestIntf_opESeqPtr& opESeqCB, - const std::deque<Test::E>& inSeq, - const Ice::Current& current) + const std::deque<Test::E>& inSeq, + const Ice::Current& current) { std::deque<Test::E> outSeq(inSeq); opESeqCB->ice_response(outSeq, outSeq); @@ -237,8 +237,8 @@ TestIntfI::opESeq_async(const Test::AMD_TestIntf_opESeqPtr& opESeqCB, void TestIntfI::opEList_async(const Test::AMD_TestIntf_opEListPtr& opEListCB, - const Test::EList& inSeq, - const Ice::Current& current) + const Test::EList& inSeq, + const Ice::Current& current) { Test::EList outSeq(inSeq); opEListCB->ice_response(outSeq, outSeq); @@ -246,8 +246,8 @@ TestIntfI::opEList_async(const Test::AMD_TestIntf_opEListPtr& opEListCB, void TestIntfI::opCPrxSeq_async(const Test::AMD_TestIntf_opCPrxSeqPtr& opCPrxSeqCB, - const std::deque<Test::CPrx>& inSeq, - const Ice::Current& current) + const std::deque<Test::CPrx>& inSeq, + const Ice::Current& current) { std::deque<Test::CPrx> outSeq(inSeq); opCPrxSeqCB->ice_response(outSeq, outSeq); @@ -255,8 +255,8 @@ TestIntfI::opCPrxSeq_async(const Test::AMD_TestIntf_opCPrxSeqPtr& opCPrxSeqCB, void TestIntfI::opCPrxList_async(const Test::AMD_TestIntf_opCPrxListPtr& opCPrxListCB, - const Test::CPrxList& inSeq, - const Ice::Current& current) + const Test::CPrxList& inSeq, + const Ice::Current& current) { Test::CPrxList outSeq(inSeq); opCPrxListCB->ice_response(outSeq, outSeq); @@ -264,8 +264,8 @@ TestIntfI::opCPrxList_async(const Test::AMD_TestIntf_opCPrxListPtr& opCPrxListCB void TestIntfI::opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr& opCSeqCB, - const std::deque<Test::CPtr>& inSeq, - const Ice::Current& current) + const std::deque<Test::CPtr>& inSeq, + const Ice::Current& current) { std::deque<Test::CPtr> outSeq(inSeq); opCSeqCB->ice_response(outSeq, outSeq); @@ -273,8 +273,8 @@ TestIntfI::opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr& opCSeqCB, void TestIntfI::opCList_async(const Test::AMD_TestIntf_opCListPtr& opCListCB, - const Test::CList& inSeq, - const Ice::Current& current) + const Test::CList& inSeq, + const Ice::Current& current) { Test::CList outSeq(inSeq); opCListCB->ice_response(outSeq, outSeq); @@ -282,16 +282,16 @@ TestIntfI::opCList_async(const Test::AMD_TestIntf_opCListPtr& opCListCB, void TestIntfI::opClassStruct_async(const ::Test::AMD_TestIntf_opClassStructPtr& cb, - const ::Test::ClassStructPtr& inS, - const ::Test::ClassStructSeq& inSeq, - const ::Ice::Current&) + const ::Test::ClassStructPtr& inS, + const ::Test::ClassStructSeq& inSeq, + const ::Ice::Current&) { cb->ice_response(inS, inS, inSeq); } void TestIntfI::shutdown_async(const Test::AMD_TestIntf_shutdownPtr& shutdownCB, - const Ice::Current& current) + const Ice::Current& current) { _communicator->shutdown(); shutdownCB->ice_response(); diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h index 634d7f64ce8..04133eb2e50 100644 --- a/cpp/test/Ice/custom/TestAMDI.h +++ b/cpp/test/Ice/custom/TestAMDI.h @@ -19,130 +19,130 @@ public: TestIntfI(const Ice::CommunicatorPtr&); virtual void opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr&, - const std::pair<const Ice::Double*, const Ice::Double*>&, - const Ice::Current&); + const std::pair<const Ice::Double*, const Ice::Double*>&, + const Ice::Current&); virtual void opBoolArray_async(const Test::AMD_TestIntf_opBoolArrayPtr&, - const std::pair<const bool*, const bool*>&, - const Ice::Current&); + const std::pair<const bool*, const bool*>&, + const Ice::Current&); virtual void opByteArray_async(const Test::AMD_TestIntf_opByteArrayPtr&, - const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, - const Ice::Current&); + const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, + const Ice::Current&); virtual void opVariableArray_async(const Test::AMD_TestIntf_opVariableArrayPtr&, - const std::pair<const Test::Variable*, const Test::Variable*>&, - const Ice::Current&); + const std::pair<const Test::Variable*, const Test::Variable*>&, + const Ice::Current&); virtual void opBoolRange_async(const Test::AMD_TestIntf_opBoolRangePtr&, - const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>&, - const Ice::Current&); + const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>&, + const Ice::Current&); virtual void opByteRange_async(const Test::AMD_TestIntf_opByteRangePtr&, - const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>&, - const Ice::Current&); + const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>&, + const Ice::Current&); virtual void opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr&, - const std::pair<Test::VariableList::const_iterator, - Test::VariableList::const_iterator>&, - const Ice::Current&); + const std::pair<Test::VariableList::const_iterator, + Test::VariableList::const_iterator>&, + const Ice::Current&); virtual void opBoolRangeType_async(const Test::AMD_TestIntf_opBoolRangeTypePtr&, - const std::pair<const bool*, const bool*>&, - const Ice::Current&); + const std::pair<const bool*, const bool*>&, + const Ice::Current&); virtual void opByteRangeType_async(const Test::AMD_TestIntf_opByteRangeTypePtr&, - const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>&, - const Ice::Current&); + const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>&, + const Ice::Current&); virtual void opVariableRangeType_async(const Test::AMD_TestIntf_opVariableRangeTypePtr&, - const std::pair<std::deque<Test::Variable>::const_iterator, - std::deque<Test::Variable>::const_iterator>&, - const Ice::Current&); + const std::pair<std::deque<Test::Variable>::const_iterator, + std::deque<Test::Variable>::const_iterator>&, + const Ice::Current&); virtual void opBoolSeq_async(const Test::AMD_TestIntf_opBoolSeqPtr&, - const std::deque<bool>&, - const Ice::Current&); + const std::deque<bool>&, + const Ice::Current&); virtual void opBoolList_async(const Test::AMD_TestIntf_opBoolListPtr&, - const Test::BoolList&, - const Ice::Current&); + const Test::BoolList&, + const Ice::Current&); virtual void opByteSeq_async(const Test::AMD_TestIntf_opByteSeqPtr&, - const std::deque<Ice::Byte>&, - const Ice::Current&); + const std::deque<Ice::Byte>&, + const Ice::Current&); virtual void opByteList_async(const Test::AMD_TestIntf_opByteListPtr&, - const Test::ByteList&, - const Ice::Current&); + const Test::ByteList&, + const Ice::Current&); virtual void opMyByteSeq_async(const Test::AMD_TestIntf_opMyByteSeqPtr&, - const MyByteSeq&, - const Ice::Current&); + const MyByteSeq&, + const Ice::Current&); virtual void opStringSeq_async(const Test::AMD_TestIntf_opStringSeqPtr&, - const std::deque<std::string>&, - const Ice::Current&); + const std::deque<std::string>&, + const Ice::Current&); virtual void opStringList_async(const Test::AMD_TestIntf_opStringListPtr&, - const Test::StringList&, - const Ice::Current&); + const Test::StringList&, + const Ice::Current&); virtual void opFixedSeq_async(const Test::AMD_TestIntf_opFixedSeqPtr&, - const std::deque<Test::Fixed>&, - const Ice::Current&); + const std::deque<Test::Fixed>&, + const Ice::Current&); virtual void opFixedList_async(const Test::AMD_TestIntf_opFixedListPtr&, - const Test::FixedList&, - const Ice::Current&); + const Test::FixedList&, + const Ice::Current&); virtual void opVariableSeq_async(const Test::AMD_TestIntf_opVariableSeqPtr&, - const std::deque<Test::Variable>&, - const Ice::Current&); + const std::deque<Test::Variable>&, + const Ice::Current&); virtual void opVariableList_async(const Test::AMD_TestIntf_opVariableListPtr&, - const Test::VariableList&, - const Ice::Current&); + const Test::VariableList&, + const Ice::Current&); virtual void opStringStringDictSeq_async(const Test::AMD_TestIntf_opStringStringDictSeqPtr&, - const std::deque<Test::StringStringDict>&, - const Ice::Current&); + const std::deque<Test::StringStringDict>&, + const Ice::Current&); virtual void opStringStringDictList_async(const Test::AMD_TestIntf_opStringStringDictListPtr&, - const Test::StringStringDictList&, - const Ice::Current&); + const Test::StringStringDictList&, + const Ice::Current&); virtual void opESeq_async(const Test::AMD_TestIntf_opESeqPtr&, - const std::deque<Test::E>&, - const Ice::Current&); + const std::deque<Test::E>&, + const Ice::Current&); virtual void opEList_async(const Test::AMD_TestIntf_opEListPtr&, - const Test::EList&, - const Ice::Current&); + const Test::EList&, + const Ice::Current&); virtual void opCPrxSeq_async(const Test::AMD_TestIntf_opCPrxSeqPtr&, - const std::deque<Test::CPrx>&, - const Ice::Current&); + const std::deque<Test::CPrx>&, + const Ice::Current&); virtual void opCPrxList_async(const Test::AMD_TestIntf_opCPrxListPtr&, - const Test::CPrxList&, - const Ice::Current&); + const Test::CPrxList&, + const Ice::Current&); virtual void opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr&, - const std::deque<Test::CPtr>&, - const Ice::Current&); + const std::deque<Test::CPtr>&, + const Ice::Current&); virtual void opCList_async(const Test::AMD_TestIntf_opCListPtr&, - const Test::CList&, - const Ice::Current&); + const Test::CList&, + const Ice::Current&); virtual void opClassStruct_async(const ::Test::AMD_TestIntf_opClassStructPtr&, - const ::Test::ClassStructPtr&, - const ::Test::ClassStructSeq&, - const ::Ice::Current&); + const ::Test::ClassStructPtr&, + const ::Test::ClassStructSeq&, + const ::Ice::Current&); virtual void shutdown_async(const Test::AMD_TestIntf_shutdownPtr&, - const Ice::Current&); + const Ice::Current&); private: diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp index e25e467d09a..df9e4f055da 100644 --- a/cpp/test/Ice/custom/TestI.cpp +++ b/cpp/test/Ice/custom/TestI.cpp @@ -17,8 +17,8 @@ TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator) Test::DoubleSeq TestIntfI::opDoubleArray(const std::pair<const Ice::Double*, const Ice::Double*>& inSeq, - Test::DoubleSeq& outSeq, - const Ice::Current& current) + Test::DoubleSeq& outSeq, + const Ice::Current& current) { Test::DoubleSeq(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -26,8 +26,8 @@ TestIntfI::opDoubleArray(const std::pair<const Ice::Double*, const Ice::Double*> Test::BoolSeq TestIntfI::opBoolArray(const std::pair<const bool*, const bool*>& inSeq, - Test::BoolSeq& outSeq, - const Ice::Current& current) + Test::BoolSeq& outSeq, + const Ice::Current& current) { Test::BoolSeq(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -35,8 +35,8 @@ TestIntfI::opBoolArray(const std::pair<const bool*, const bool*>& inSeq, Test::ByteList TestIntfI::opByteArray(const std::pair<const Ice::Byte*, const Ice::Byte*>& inSeq, - Test::ByteList& outSeq, - const Ice::Current& current) + Test::ByteList& outSeq, + const Ice::Current& current) { Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -44,8 +44,8 @@ TestIntfI::opByteArray(const std::pair<const Ice::Byte*, const Ice::Byte*>& inSe Test::VariableList TestIntfI::opVariableArray(const std::pair<const Test::Variable*, const Test::Variable*>& inSeq, - Test::VariableList& outSeq, - const Ice::Current& current) + Test::VariableList& outSeq, + const Ice::Current& current) { Test::VariableList(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -53,8 +53,8 @@ TestIntfI::opVariableArray(const std::pair<const Test::Variable*, const Test::Va Test::BoolSeq TestIntfI::opBoolRange(const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>& inSeq, - Test::BoolSeq& outSeq, - const Ice::Current&) + Test::BoolSeq& outSeq, + const Ice::Current&) { Test::BoolSeq(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -62,8 +62,8 @@ TestIntfI::opBoolRange(const std::pair<Test::BoolSeq::const_iterator, Test::Bool Test::ByteList TestIntfI::opByteRange(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, - Test::ByteList& outSeq, - const Ice::Current&) + Test::ByteList& outSeq, + const Ice::Current&) { Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -71,9 +71,9 @@ TestIntfI::opByteRange(const std::pair<Test::ByteList::const_iterator, Test::Byt Test::VariableList TestIntfI::opVariableRange( - const std::pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator>& inSeq, - Test::VariableList& outSeq, - const Ice::Current&) + const std::pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator>& inSeq, + Test::VariableList& outSeq, + const Ice::Current&) { Test::VariableList(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -81,8 +81,8 @@ TestIntfI::opVariableRange( Test::BoolSeq TestIntfI::opBoolRangeType(const std::pair<const bool*, const bool*>& inSeq, - Test::BoolSeq& outSeq, - const Ice::Current&) + Test::BoolSeq& outSeq, + const Ice::Current&) { Test::BoolSeq(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -90,8 +90,8 @@ TestIntfI::opBoolRangeType(const std::pair<const bool*, const bool*>& inSeq, Test::ByteList TestIntfI::opByteRangeType(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, - Test::ByteList& outSeq, - const Ice::Current&) + Test::ByteList& outSeq, + const Ice::Current&) { Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -99,21 +99,21 @@ TestIntfI::opByteRangeType(const std::pair<Test::ByteList::const_iterator, Test: Test::VariableList TestIntfI::opVariableRangeType( - const std::pair<std::deque<Test::Variable>::const_iterator, std::deque<Test::Variable>::const_iterator>& inSeq, - Test::VariableList& outSeq, - const Ice::Current&) + const std::pair<std::deque<Test::Variable>::const_iterator, std::deque<Test::Variable>::const_iterator>& inSeq, + Test::VariableList& outSeq, + const Ice::Current&) { for(std::deque<Test::Variable>::const_iterator p = inSeq.first; p != inSeq.second; ++p) { - outSeq.push_back(*p); + outSeq.push_back(*p); } return outSeq; } std::deque<bool> TestIntfI::opBoolSeq(const std::deque<bool>& inSeq, - std::deque<bool>& outSeq, - const Ice::Current& current) + std::deque<bool>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -121,8 +121,8 @@ TestIntfI::opBoolSeq(const std::deque<bool>& inSeq, std::list<bool> TestIntfI::opBoolList(const std::list<bool>& inSeq, - std::list<bool>& outSeq, - const Ice::Current& current) + std::list<bool>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -130,8 +130,8 @@ TestIntfI::opBoolList(const std::list<bool>& inSeq, std::deque< ::Ice::Byte> TestIntfI::opByteSeq(const std::deque< ::Ice::Byte>& inSeq, - std::deque< ::Ice::Byte>& outSeq, - const Ice::Current& current) + std::deque< ::Ice::Byte>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -139,8 +139,8 @@ TestIntfI::opByteSeq(const std::deque< ::Ice::Byte>& inSeq, std::list< ::Ice::Byte> TestIntfI::opByteList(const std::list< ::Ice::Byte>& inSeq, - std::list< ::Ice::Byte>& outSeq, - const Ice::Current& current) + std::list< ::Ice::Byte>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -148,8 +148,8 @@ TestIntfI::opByteList(const std::list< ::Ice::Byte>& inSeq, MyByteSeq TestIntfI::opMyByteSeq(const MyByteSeq& inSeq, - MyByteSeq& outSeq, - const Ice::Current& current) + MyByteSeq& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -157,8 +157,8 @@ TestIntfI::opMyByteSeq(const MyByteSeq& inSeq, std::deque< ::std::string> TestIntfI::opStringSeq(const std::deque< ::std::string>& inSeq, - std::deque< ::std::string>& outSeq, - const Ice::Current& current) + std::deque< ::std::string>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -166,8 +166,8 @@ TestIntfI::opStringSeq(const std::deque< ::std::string>& inSeq, std::list< ::std::string> TestIntfI::opStringList(const std::list< ::std::string>& inSeq, - std::list< ::std::string>& outSeq, - const Ice::Current& current) + std::list< ::std::string>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -175,8 +175,8 @@ TestIntfI::opStringList(const std::list< ::std::string>& inSeq, std::deque< ::Test::Fixed> TestIntfI::opFixedSeq(const std::deque< ::Test::Fixed>& inSeq, - std::deque< ::Test::Fixed>& outSeq, - const Ice::Current& current) + std::deque< ::Test::Fixed>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -184,8 +184,8 @@ TestIntfI::opFixedSeq(const std::deque< ::Test::Fixed>& inSeq, std::list< ::Test::Fixed> TestIntfI::opFixedList(const std::list< ::Test::Fixed>& inSeq, - std::list< ::Test::Fixed>& outSeq, - const Ice::Current& current) + std::list< ::Test::Fixed>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -193,8 +193,8 @@ TestIntfI::opFixedList(const std::list< ::Test::Fixed>& inSeq, std::deque< ::Test::Variable> TestIntfI::opVariableSeq(const std::deque< ::Test::Variable>& inSeq, - std::deque< ::Test::Variable>& outSeq, - const Ice::Current& current) + std::deque< ::Test::Variable>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -202,8 +202,8 @@ TestIntfI::opVariableSeq(const std::deque< ::Test::Variable>& inSeq, std::list< ::Test::Variable> TestIntfI::opVariableList(const std::list< ::Test::Variable>& inSeq, - std::list< ::Test::Variable>& outSeq, - const Ice::Current& current) + std::list< ::Test::Variable>& outSeq, + const Ice::Current& current) { outSeq = inSeq; return inSeq; @@ -283,10 +283,10 @@ TestIntfI::opCList(const std::list< ::Test::CPtr>& inSeq, ::Test::ClassStructPtr TestIntfI::opClassStruct(const ::Test::ClassStructPtr& inS, - const ::Test::ClassStructSeq& inSeq, - ::Test::ClassStructPtr& out, - ::Test::ClassStructSeq& outSeq, - const Ice::Current&) + const ::Test::ClassStructSeq& inSeq, + ::Test::ClassStructPtr& out, + ::Test::ClassStructSeq& outSeq, + const Ice::Current&) { outSeq = inSeq; out = inS; diff --git a/cpp/test/Ice/custom/TestI.h b/cpp/test/Ice/custom/TestI.h index c8800c755e4..c0aaa4b4416 100644 --- a/cpp/test/Ice/custom/TestI.h +++ b/cpp/test/Ice/custom/TestI.h @@ -19,92 +19,92 @@ public: TestIntfI(const Ice::CommunicatorPtr&); virtual Test::DoubleSeq opDoubleArray(const std::pair<const Ice::Double*, const Ice::Double*>&, - Test::DoubleSeq&, - const Ice::Current&); + Test::DoubleSeq&, + const Ice::Current&); virtual Test::BoolSeq opBoolArray(const std::pair<const bool*, const bool*>&, - Test::BoolSeq&, - const Ice::Current&); + Test::BoolSeq&, + const Ice::Current&); virtual Test::ByteList opByteArray(const std::pair<const Ice::Byte*, const Ice::Byte*>&, - Test::ByteList&, - const Ice::Current&); + Test::ByteList&, + const Ice::Current&); virtual Test::VariableList opVariableArray(const std::pair<const Test::Variable*, const Test::Variable*>&, - Test::VariableList&, - const Ice::Current&); + Test::VariableList&, + const Ice::Current&); virtual Test::BoolSeq opBoolRange(const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>&, - Test::BoolSeq&, - const Ice::Current&); + Test::BoolSeq&, + const Ice::Current&); virtual Test::ByteList opByteRange(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>&, - Test::ByteList&, - const Ice::Current&); + Test::ByteList&, + const Ice::Current&); virtual Test::VariableList opVariableRange(const std::pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator>&, - Test::VariableList&, - const Ice::Current&); + Test::VariableList&, + const Ice::Current&); virtual Test::BoolSeq opBoolRangeType(const std::pair<const bool*, const bool*>&, - Test::BoolSeq&, - const Ice::Current&); + Test::BoolSeq&, + const Ice::Current&); virtual Test::ByteList opByteRangeType(const std::pair<Test::ByteList::const_iterator, - Test::ByteList::const_iterator>&, - Test::ByteList&, - const Ice::Current&); + Test::ByteList::const_iterator>&, + Test::ByteList&, + const Ice::Current&); virtual Test::VariableList opVariableRangeType(const std::pair<std::deque<Test::Variable>::const_iterator, - std::deque<Test::Variable>::const_iterator>&, - Test::VariableList&, - const Ice::Current&); + std::deque<Test::Variable>::const_iterator>&, + Test::VariableList&, + const Ice::Current&); virtual std::deque<bool> opBoolSeq(const std::deque<bool>&, - std::deque<bool>&, - const Ice::Current&); + std::deque<bool>&, + const Ice::Current&); virtual std::list<bool> opBoolList(const std::list<bool>&, - std::list<bool>&, - const Ice::Current&); + std::list<bool>&, + const Ice::Current&); virtual std::deque< ::Ice::Byte> opByteSeq(const std::deque< ::Ice::Byte>&, - std::deque< ::Ice::Byte>&, - const Ice::Current&); + std::deque< ::Ice::Byte>&, + const Ice::Current&); virtual std::list< ::Ice::Byte> opByteList(const std::list< ::Ice::Byte>&, - std::list< ::Ice::Byte>&, - const Ice::Current&); + std::list< ::Ice::Byte>&, + const Ice::Current&); virtual MyByteSeq opMyByteSeq(const MyByteSeq&, - MyByteSeq&, - const Ice::Current&); + MyByteSeq&, + const Ice::Current&); virtual std::deque< ::std::string> opStringSeq(const std::deque< ::std::string>&, - std::deque< ::std::string>&, - const Ice::Current&); + std::deque< ::std::string>&, + const Ice::Current&); virtual std::list< ::std::string> opStringList(const std::list< ::std::string>&, - std::list< ::std::string>&, - const Ice::Current&); + std::list< ::std::string>&, + const Ice::Current&); virtual std::deque< ::Test::Fixed> opFixedSeq(const std::deque< ::Test::Fixed>&, - std::deque< ::Test::Fixed>&, - const Ice::Current&); + std::deque< ::Test::Fixed>&, + const Ice::Current&); virtual std::list< ::Test::Fixed> opFixedList(const std::list< ::Test::Fixed>&, - std::list< ::Test::Fixed>&, - const Ice::Current&); + std::list< ::Test::Fixed>&, + const Ice::Current&); virtual std::deque< ::Test::Variable> opVariableSeq(const std::deque< ::Test::Variable>&, - std::deque< ::Test::Variable>&, - const Ice::Current&); + std::deque< ::Test::Variable>&, + const Ice::Current&); virtual std::list< ::Test::Variable> opVariableList(const std::list< ::Test::Variable>&, - std::list< ::Test::Variable>&, - const Ice::Current&); + std::list< ::Test::Variable>&, + const Ice::Current&); virtual std::deque< ::Test::StringStringDict> opStringStringDictSeq(const std::deque< ::Test::StringStringDict>&, std::deque< ::Test::StringStringDict>&, @@ -139,10 +139,10 @@ public: const Ice::Current&); virtual ::Test::ClassStructPtr opClassStruct(const ::Test::ClassStructPtr&, - const ::Test::ClassStructSeq&, - ::Test::ClassStructPtr& out, - ::Test::ClassStructSeq& outSeq, - const Ice::Current&); + const ::Test::ClassStructSeq&, + ::Test::ClassStructPtr& out, + ::Test::ClassStructSeq& outSeq, + const Ice::Current&); virtual void shutdown(const Ice::Current&); diff --git a/cpp/test/Ice/custom/WstringAMDI.cpp b/cpp/test/Ice/custom/WstringAMDI.cpp index 9e827b7e870..1663c138aea 100644 --- a/cpp/test/Ice/custom/WstringAMDI.cpp +++ b/cpp/test/Ice/custom/WstringAMDI.cpp @@ -11,24 +11,24 @@ void Test1::WstringClassI::opString_async(const ::Test1::AMD_WstringClass_opStringPtr& opStringCB, - const ::std::wstring& s1, - const Ice::Current& current) + const ::std::wstring& s1, + const Ice::Current& current) { opStringCB->ice_response(s1, s1); } void Test1::WstringClassI::opStruct_async(const ::Test1::AMD_WstringClass_opStructPtr& opStructCB, - const ::Test1::WstringStruct& s1, - const Ice::Current& current) + const ::Test1::WstringStruct& s1, + const Ice::Current& current) { opStructCB->ice_response(s1, s1); } void Test1::WstringClassI::throwExcept_async(const ::Test1::AMD_WstringClass_throwExceptPtr& throwExceptCB, - const ::std::wstring& reason, - const Ice::Current& current) + const ::std::wstring& reason, + const Ice::Current& current) { Test1::WstringException ex; ex.reason = reason; @@ -37,24 +37,24 @@ Test1::WstringClassI::throwExcept_async(const ::Test1::AMD_WstringClass_throwExc void Test2::WstringClassI::opString_async(const ::Test2::AMD_WstringClass_opStringPtr& opStringCB, - const ::std::wstring& s1, - const Ice::Current& current) + const ::std::wstring& s1, + const Ice::Current& current) { opStringCB->ice_response(s1, s1); } void Test2::WstringClassI::opStruct_async(const ::Test2::AMD_WstringClass_opStructPtr& opStructCB, - const ::Test2::WstringStruct& s1, - const Ice::Current& current) + const ::Test2::WstringStruct& s1, + const Ice::Current& current) { opStructCB->ice_response(s1, s1); } void Test2::WstringClassI::throwExcept_async(const ::Test2::AMD_WstringClass_throwExceptPtr& throwExceptCB, - const ::std::wstring& reason, - const Ice::Current& current) + const ::std::wstring& reason, + const Ice::Current& current) { Test2::WstringException ex; ex.reason = reason; diff --git a/cpp/test/Ice/custom/WstringAMDI.h b/cpp/test/Ice/custom/WstringAMDI.h index 2f5058c1f6a..a2eadd58cf4 100644 --- a/cpp/test/Ice/custom/WstringAMDI.h +++ b/cpp/test/Ice/custom/WstringAMDI.h @@ -20,16 +20,16 @@ class WstringClassI : virtual public WstringClass public: virtual void opString_async(const ::Test1::AMD_WstringClass_opStringPtr&, - const ::std::wstring&, - const Ice::Current&); + const ::std::wstring&, + const Ice::Current&); virtual void opStruct_async(const ::Test1::AMD_WstringClass_opStructPtr&, - const ::Test1::WstringStruct&, - const Ice::Current&); + const ::Test1::WstringStruct&, + const Ice::Current&); virtual void throwExcept_async(const ::Test1::AMD_WstringClass_throwExceptPtr&, - const ::std::wstring&, - const Ice::Current&); + const ::std::wstring&, + const Ice::Current&); }; } @@ -42,16 +42,16 @@ class WstringClassI : virtual public WstringClass public: virtual void opString_async(const ::Test2::AMD_WstringClass_opStringPtr&, - const ::std::wstring&, - const Ice::Current&); + const ::std::wstring&, + const Ice::Current&); virtual void opStruct_async(const ::Test2::AMD_WstringClass_opStructPtr&, - const ::Test2::WstringStruct&, - const Ice::Current&); + const ::Test2::WstringStruct&, + const Ice::Current&); virtual void throwExcept_async(const ::Test2::AMD_WstringClass_throwExceptPtr&, - const ::std::wstring&, - const Ice::Current&); + const ::std::wstring&, + const Ice::Current&); }; } diff --git a/cpp/test/Ice/custom/WstringI.cpp b/cpp/test/Ice/custom/WstringI.cpp index 75681f1f195..58af4234727 100644 --- a/cpp/test/Ice/custom/WstringI.cpp +++ b/cpp/test/Ice/custom/WstringI.cpp @@ -11,8 +11,8 @@ ::std::wstring Test1::WstringClassI::opString(const ::std::wstring& s1, - ::std::wstring& s2, - const Ice::Current& current) + ::std::wstring& s2, + const Ice::Current& current) { s2 = s1; return s1; @@ -20,8 +20,8 @@ Test1::WstringClassI::opString(const ::std::wstring& s1, ::Test1::WstringStruct Test1::WstringClassI::opStruct(const ::Test1::WstringStruct& s1, - ::Test1::WstringStruct& s2, - const Ice::Current& current) + ::Test1::WstringStruct& s2, + const Ice::Current& current) { s2 = s1; return s1; @@ -29,7 +29,7 @@ Test1::WstringClassI::opStruct(const ::Test1::WstringStruct& s1, void Test1::WstringClassI::throwExcept(const ::std::wstring& reason, - const Ice::Current& current) + const Ice::Current& current) { Test1::WstringException ex; ex.reason = reason; @@ -38,8 +38,8 @@ Test1::WstringClassI::throwExcept(const ::std::wstring& reason, ::std::wstring Test2::WstringClassI::opString(const ::std::wstring& s1, - ::std::wstring& s2, - const Ice::Current& current) + ::std::wstring& s2, + const Ice::Current& current) { s2 = s1; return s1; @@ -47,8 +47,8 @@ Test2::WstringClassI::opString(const ::std::wstring& s1, ::Test2::WstringStruct Test2::WstringClassI::opStruct(const ::Test2::WstringStruct& s1, - ::Test2::WstringStruct& s2, - const Ice::Current& current) + ::Test2::WstringStruct& s2, + const Ice::Current& current) { s2 = s1; return s1; @@ -56,7 +56,7 @@ Test2::WstringClassI::opStruct(const ::Test2::WstringStruct& s1, void Test2::WstringClassI::throwExcept(const ::std::wstring& reason, - const Ice::Current& current) + const Ice::Current& current) { Test2::WstringException ex; ex.reason = reason; diff --git a/cpp/test/Ice/custom/WstringI.h b/cpp/test/Ice/custom/WstringI.h index e785a8ed33f..87fa6397e38 100644 --- a/cpp/test/Ice/custom/WstringI.h +++ b/cpp/test/Ice/custom/WstringI.h @@ -20,15 +20,15 @@ class WstringClassI : virtual public WstringClass public: virtual ::std::wstring opString(const ::std::wstring&, - ::std::wstring&, - const Ice::Current&); + ::std::wstring&, + const Ice::Current&); virtual ::Test1::WstringStruct opStruct(const ::Test1::WstringStruct&, - ::Test1::WstringStruct&, - const Ice::Current&); + ::Test1::WstringStruct&, + const Ice::Current&); virtual void throwExcept(const ::std::wstring&, - const Ice::Current&); + const Ice::Current&); }; } @@ -41,15 +41,15 @@ class WstringClassI : virtual public WstringClass public: virtual ::std::wstring opString(const ::std::wstring&, - ::std::wstring&, - const Ice::Current&); + ::std::wstring&, + const Ice::Current&); virtual ::Test2::WstringStruct opStruct(const ::Test2::WstringStruct&, - ::Test2::WstringStruct&, - const Ice::Current&); + ::Test2::WstringStruct&, + const Ice::Current&); virtual void throwExcept(const ::std::wstring&, - const Ice::Current&); + const Ice::Current&); }; } |