sequence, dictionary

1 files changed, 102 insertions, 102 deletions

diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index f2a55800a3f..600f8b5b2ec 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -104,38 +104,38 @@ MyDerivedClassI::opMyClass(const Test::MyClassPrx& p1,
     return Test::MyClassPrx::uncheckedCast(_adapter->objectToProxy(this));
 }
 
-Test::ByteV
-MyDerivedClassI::opByteV(const Test::ByteV& p1,
-			 const Test::ByteV& p2,
-			 Test::ByteV& p3)
+Test::ByteS
+MyDerivedClassI::opByteS(const Test::ByteS& p1,
+			 const Test::ByteS& p2,
+			 Test::ByteS& p3)
 {
     p3.resize(p1.size());
     std::reverse_copy(p1.begin(), p1.end(), p3.begin());
-    Test::ByteV r = p1;
+    Test::ByteS r = p1;
     std::copy(p2.begin(), p2.end(), std::back_inserter(r));
     return r;
 }
 
-Test::BoolV
-MyDerivedClassI::opBoolV(const Test::BoolV& p1,
-			 const Test::BoolV& p2,
-			 Test::BoolV& p3)
+Test::BoolS
+MyDerivedClassI::opBoolS(const Test::BoolS& p1,
+			 const Test::BoolS& p2,
+			 Test::BoolS& p3)
 {
     p3 = p1;
     std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
-    Test::BoolV r;
+    Test::BoolS r;
     r.resize(p1.size());
     std::reverse_copy(p1.begin(), p1.end(), r.begin());
     return r;
 }
 
-Test::LongV
-MyDerivedClassI::opShortIntLongV(const Test::ShortV& p1,
-				 const Test::IntV& p2,
-				 const Test::LongV& p3,
-				 Test::ShortV& p4,
-				 Test::IntV& p5,
-				 Test::LongV& p6)
+Test::LongS
+MyDerivedClassI::opShortIntLongS(const Test::ShortS& p1,
+				 const Test::IntS& p2,
+				 const Test::LongS& p3,
+				 Test::ShortS& p4,
+				 Test::IntS& p5,
+				 Test::LongS& p6)
 {
     p4 = p1;
     p5.resize(p2.size());
@@ -145,78 +145,78 @@ MyDerivedClassI::opShortIntLongV(const Test::ShortV& p1,
     return p3;
 }
 
-Test::DoubleV
-MyDerivedClassI::opFloatDoubleV(const Test::FloatV& p1,
-				const Test::DoubleV& p2,
-				Test::FloatV& p3,
-				Test::DoubleV& p4)
+Test::DoubleS
+MyDerivedClassI::opFloatDoubleS(const Test::FloatS& p1,
+				const Test::DoubleS& p2,
+				Test::FloatS& p3,
+				Test::DoubleS& p4)
 {
     p3 = p1;
     p4.resize(p2.size());
     std::reverse_copy(p2.begin(), p2.end(), p4.begin());
-    Test::DoubleV r = p2;
+    Test::DoubleS r = p2;
     std::copy(p1.begin(), p1.end(), std::back_inserter(r));
     return r;
 }
 
-Test::StringV
-MyDerivedClassI::opStringV(const Test::StringV& p1,
-			   const Test::StringV& p2,
-			   Test::StringV& p3)
+Test::StringS
+MyDerivedClassI::opStringS(const Test::StringS& p1,
+			   const Test::StringS& p2,
+			   Test::StringS& p3)
 {
     p3 = p1;
     std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
-    Test::StringV r;
+    Test::StringS r;
     r.resize(p1.size());
     std::reverse_copy(p1.begin(), p1.end(), r.begin());
     return r;
 }
 
-Test::WStringV
-MyDerivedClassI::opWStringV(const Test::WStringV& p1,
-			    const Test::WStringV& p2,
-			    Test::WStringV& p3)
+Test::WStringS
+MyDerivedClassI::opWStringS(const Test::WStringS& p1,
+			    const Test::WStringS& p2,
+			    Test::WStringS& p3)
 {
     p3 = p1;
     std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
-    Test::WStringV r;
+    Test::WStringS r;
     r.resize(p1.size());
     std::reverse_copy(p1.begin(), p1.end(), r.begin());
     return r;
 }
 
-Test::ByteVV
-MyDerivedClassI::opByteVV(const Test::ByteVV& p1,
-			  const Test::ByteVV& p2,
-			  Test::ByteVV& p3)
+Test::ByteSS
+MyDerivedClassI::opByteSS(const Test::ByteSS& p1,
+			  const Test::ByteSS& p2,
+			  Test::ByteSS& p3)
 {
     p3.resize(p1.size());
     std::reverse_copy(p1.begin(), p1.end(), p3.begin());
-    Test::ByteVV r = p1;
+    Test::ByteSS r = p1;
     std::copy(p2.begin(), p2.end(), std::back_inserter(r));
     return r;
 }
 
-Test::BoolVV
-MyDerivedClassI::opBoolVV(const Test::BoolVV& p1,
-			  const Test::BoolVV& p2,
-			  Test::BoolVV& p3)
+Test::BoolSS
+MyDerivedClassI::opBoolSS(const Test::BoolSS& p1,
+			  const Test::BoolSS& p2,
+			  Test::BoolSS& p3)
 {
     p3 = p1;
     std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
-    Test::BoolVV r;
+    Test::BoolSS r;
     r.resize(p1.size());
     std::reverse_copy(p1.begin(), p1.end(), r.begin());
     return r;
 }
 
-Test::LongVV
-MyDerivedClassI::opShortIntLongVV(const Test::ShortVV& p1,
-				  const Test::IntVV& p2,
-				  const Test::LongVV& p3,
-				  Test::ShortVV& p4,
-				  Test::IntVV& p5,
-				  Test::LongVV& p6)
+Test::LongSS
+MyDerivedClassI::opShortIntLongSS(const Test::ShortSS& p1,
+				  const Test::IntSS& p2,
+				  const Test::LongSS& p3,
+				  Test::ShortSS& p4,
+				  Test::IntSS& p5,
+				  Test::LongSS& p6)
 {
     p4 = p1;
     p5.resize(p2.size());
@@ -226,41 +226,41 @@ MyDerivedClassI::opShortIntLongVV(const Test::ShortVV& p1,
     return p3;
 }
 
-Test::DoubleVV
-MyDerivedClassI::opFloatDoubleVV(const Test::FloatVV& p1,
-				 const Test::DoubleVV& p2,
-				 Test::FloatVV& p3,
-				 Test::DoubleVV& p4)
+Test::DoubleSS
+MyDerivedClassI::opFloatDoubleSS(const Test::FloatSS& p1,
+				 const Test::DoubleSS& p2,
+				 Test::FloatSS& p3,
+				 Test::DoubleSS& p4)
 {
     p3 = p1;
     p4.resize(p2.size());
     std::reverse_copy(p2.begin(), p2.end(), p4.begin());
-    Test::DoubleVV r = p2;
+    Test::DoubleSS r = p2;
     std::copy(p2.begin(), p2.end(), std::back_inserter(r));
     return r;
 }
 
-Test::StringVV
-MyDerivedClassI::opStringVV(const Test::StringVV& p1,
-			    const Test::StringVV& p2,
-			    Test::StringVV& p3)
+Test::StringSS
+MyDerivedClassI::opStringSS(const Test::StringSS& p1,
+			    const Test::StringSS& p2,
+			    Test::StringSS& p3)
 {
     p3 = p1;
     std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
-    Test::StringVV r;
+    Test::StringSS r;
     r.resize(p2.size());
     std::reverse_copy(p2.begin(), p2.end(), r.begin());
     return r;
 }
 
-Test::WStringVV
-MyDerivedClassI::opWStringVV(const Test::WStringVV& p1,
-			     const Test::WStringVV& p2,
-			     Test::WStringVV& p3)
+Test::WStringSS
+MyDerivedClassI::opWStringSS(const Test::WStringSS& p1,
+			     const Test::WStringSS& p2,
+			     Test::WStringSS& p3)
 {
     p3 = p1;
     std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
-    Test::WStringVV r;
+    Test::WStringSS r;
     r.resize(p2.size());
     std::reverse_copy(p2.begin(), p2.end(), r.begin());
     return r;
@@ -323,7 +323,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 
 	case 10:
 	{
-	    Test::ByteV ex;
+	    Test::ByteS ex;
 	    ex.push_back(Ice::Byte(0x0f));
 	    ex.push_back(Ice::Byte(0xf0));
 	    throw ex;
@@ -331,7 +331,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 11:
 	{
-	    Test::BoolV ex;
+	    Test::BoolS ex;
 	    ex.push_back(true);
 	    ex.push_back(false);
 	    throw ex;
@@ -339,7 +339,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 12:
 	{
-	    Test::ShortV ex;
+	    Test::ShortS ex;
 	    ex.push_back(1);
 	    ex.push_back(2);
 	    throw ex;
@@ -347,7 +347,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 13:
 	{
-	    Test::IntV ex;
+	    Test::IntS ex;
 	    ex.push_back(3);
 	    ex.push_back(4);
 	    throw ex;
@@ -355,7 +355,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 14:
 	{
-	    Test::LongV ex;
+	    Test::LongS ex;
 	    ex.push_back(5);
 	    ex.push_back(6);
 	    throw ex;
@@ -363,7 +363,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 15:
 	{
-	    Test::FloatV ex;
+	    Test::FloatS ex;
 	    ex.push_back(Ice::Float(7.7));
 	    ex.push_back(Ice::Float(8.8));
 	    throw ex;
@@ -371,7 +371,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 16:
 	{
-	    Test::DoubleV ex;
+	    Test::DoubleS ex;
 	    ex.push_back(Ice::Double(9.9));
 	    ex.push_back(Ice::Double(10.10));
 	    throw ex;
@@ -379,7 +379,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 17:
 	{
-	    Test::StringV ex;
+	    Test::StringS ex;
 	    ex.push_back("abc");
 	    ex.push_back("def");
 	    throw ex;
@@ -387,7 +387,7 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 18:
 	{
-	    Test::WStringV ex;
+	    Test::WStringS ex;
 	    ex.push_back(L"xxx");
 	    ex.push_back(L"XXX");
 	    throw ex;
@@ -395,12 +395,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 19:
 	{
-	    Test::ByteV v1;
-	    Test::ByteV v2;
+	    Test::ByteS v1;
+	    Test::ByteS v2;
 	    v1.push_back(Ice::Byte(0x01));
 	    v2.push_back(Ice::Byte(0x10));
 	    v2.push_back(Ice::Byte(0x11));
-	    Test::ByteVV ex;
+	    Test::ByteSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;
@@ -408,12 +408,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 20:
 	{
-	    Test::BoolV v1;
-	    Test::BoolV v2;
+	    Test::BoolS v1;
+	    Test::BoolS v2;
 	    v1.push_back(true);
 	    v2.push_back(false);
 	    v2.push_back(true);
-	    Test::BoolVV ex;
+	    Test::BoolSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;
@@ -421,12 +421,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 21:
 	{
-	    Test::ShortV v1;
-	    Test::ShortV v2;
+	    Test::ShortS v1;
+	    Test::ShortS v2;
 	    v1.push_back(1);
 	    v2.push_back(2);
 	    v2.push_back(3);
-	    Test::ShortVV ex;
+	    Test::ShortSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;
@@ -434,12 +434,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 22:
 	{
-	    Test::IntV v1;
-	    Test::IntV v2;
+	    Test::IntS v1;
+	    Test::IntS v2;
 	    v1.push_back(4);
 	    v2.push_back(5);
 	    v2.push_back(6);
-	    Test::IntVV ex;
+	    Test::IntSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;
@@ -447,12 +447,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 23:
 	{
-	    Test::LongV v1;
-	    Test::LongV v2;
+	    Test::LongS v1;
+	    Test::LongS v2;
 	    v1.push_back(7);
 	    v2.push_back(8);
 	    v2.push_back(9);
-	    Test::LongVV ex;
+	    Test::LongSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;
@@ -460,12 +460,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 24:
 	{
-	    Test::FloatV v1;
-	    Test::FloatV v2;
+	    Test::FloatS v1;
+	    Test::FloatS v2;
 	    v1.push_back(Ice::Float(10.10));
 	    v2.push_back(Ice::Float(11.11));
 	    v2.push_back(Ice::Float(12.12));
-	    Test::FloatVV ex;
+	    Test::FloatSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;
@@ -473,12 +473,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 25:
 	{
-	    Test::DoubleV v1;
-	    Test::DoubleV v2;
+	    Test::DoubleS v1;
+	    Test::DoubleS v2;
 	    v1.push_back(Ice::Double(13.13));
 	    v2.push_back(Ice::Double(14.14));
 	    v2.push_back(Ice::Double(15.15));
-	    Test::DoubleVV ex;
+	    Test::DoubleSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;
@@ -486,12 +486,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 26:
 	{
-	    Test::StringV v1;
-	    Test::StringV v2;
+	    Test::StringS v1;
+	    Test::StringS v2;
 	    v1.push_back("aaa");
 	    v2.push_back("bbb");
 	    v2.push_back("ccc");
-	    Test::StringVV ex;
+	    Test::StringSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;
@@ -499,12 +499,12 @@ MyDerivedClassI::opEx(Ice::Int p)
 	
 	case 27:
 	{
-	    Test::WStringV v1;
-	    Test::WStringV v2;
+	    Test::WStringS v1;
+	    Test::WStringS v2;
 	    v1.push_back(L"aaa");
 	    v2.push_back(L"bbb");
 	    v2.push_back(L"ccc");
-	    Test::WStringVV ex;
+	    Test::WStringSS ex;
 	    ex.push_back(v1);
 	    ex.push_back(v2);
 	    throw ex;