New cpp:view-type metadata for strings, sequences and dictionaries, plus updates

to throughput demo. Fixes ICE-5382.

1 files changed, 28 insertions, 0 deletions

diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp
index 55de4e40c3d..f0486c57e7e 100644
--- a/cpp/test/Ice/optional/TestI.cpp
+++ b/cpp/test/Ice/optional/TestI.cpp
@@ -136,6 +136,17 @@ InitialI::opString(const Optional<string>& p1, Optional<string>& p3, const Curre
     return p1;
 }
 
+Optional<string>
+InitialI::opCustomString(const Optional<Util::string_view>& p1, Optional<string>& p3, const Current&)
+{
+    if(p1)
+    {
+        p3 = p1->to_string();
+    }
+    return p3;
+}
+
+
 Optional<MyEnum>
 InitialI::opMyEnum(const Optional<MyEnum>& p1, Optional<MyEnum>& p3, const Current&)
 {
@@ -339,6 +350,23 @@ InitialI::opStringIntDict(const Optional<StringIntDict>& p1, Optional<StringIntD
     return p3;
 }
 
+Optional<IntStringDict>
+InitialI::opCustomIntStringDict(const Optional<std::map<int, Util::string_view> >& p1,
+                                Optional<IntStringDict>& p3, const Current&)
+{
+    if(p1)
+    {
+        p3 = IntStringDict();
+        for(std::map<int, Util::string_view>::const_iterator p = p1->begin();
+            p != p1->end(); ++p)
+        {
+            (*p3)[p->first] = p->second.to_string();
+        }
+    }
+    return p3;
+}
+
+
 void
 InitialI::opClassAndUnknownOptional(const APtr&, const Ice::Current&)
 {