Merge remote-tracking branch 'origin/3.6'

1 files changed, 43 insertions, 1 deletions

diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index 5e97d2e5766..da52743ff8a 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -14,6 +14,7 @@
 #include <functional>
 #include <iterator>
 
+
 using namespace Ice;
 using namespace Test;
 using namespace std;
@@ -759,4 +760,45 @@ MyDerivedClassI::opMyClass1(ICE_IN(Test::MyClass1Ptr) c, const Ice::Current&)
 {
     return c;
 }
-    
+
+Test::StringS
+MyDerivedClassI::opStringLiterals(const Ice::Current&)
+{
+    Test::StringS data;
+    data.push_back(Test::s0);
+    data.push_back(Test::s1);
+    data.push_back(Test::s2);
+    data.push_back(Test::s3);
+    data.push_back(Test::s4);
+    data.push_back(Test::s5);
+    data.push_back(Test::s6);
+    data.push_back(Test::s7);
+    data.push_back(Test::s8);
+    data.push_back(Test::s9);
+    data.push_back(Test::s10);
+
+    data.push_back(Test::sw0);
+    data.push_back(Test::sw1);
+    data.push_back(Test::sw2);
+    data.push_back(Test::sw3);
+    data.push_back(Test::sw4);
+    data.push_back(Test::sw5);
+    data.push_back(Test::sw6);
+    data.push_back(Test::sw7);
+    data.push_back(Test::sw8);
+    data.push_back(Test::sw9);
+    data.push_back(Test::sw10);
+
+    data.push_back(Test::ss0);
+    data.push_back(Test::ss1);
+    data.push_back(Test::ss2);
+    data.push_back(Test::ss3);
+    data.push_back(Test::ss4);
+    data.push_back(Test::ss5);
+
+    data.push_back(Test::su0);
+    data.push_back(Test::su1);
+    data.push_back(Test::su2);
+
+    return data;
+}