Partial fix for ICE-3393:

 - strealined StreamTraits.h
 - added ability to define custom dictionaries in C++ (with cpp:type:...)
 - added tests for custom dictionaries in test/Ice/custom

Fixed ICE-4867:
 - clear parameter before unmarshaling into dictionary/map in C++
 - added test

1 files changed, 21 insertions, 0 deletions

diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp
index 7fe8a0f1b9e..2e148c6f2cd 100644
--- a/cpp/test/Ice/custom/TestI.cpp
+++ b/cpp/test/Ice/custom/TestI.cpp
@@ -337,6 +337,27 @@ TestIntfI::opOutRangeByteSeq(const Test::ByteSeq& data, Test::ByteSeq& copy, con
     copy = data;
 }
 
+Test::IntStringDict 
+TestIntfI::opIntStringDict(const Test::IntStringDict& data, Test::IntStringDict& copy, const Ice::Current&)
+{
+    copy = data;
+    return data;
+}
+
+Test::CustomMap<Ice::Long, Ice::Long> 
+TestIntfI::opVarDict(const Test::CustomMap<std::string, Ice::Int>& data,
+                     Test::CustomMap<std::string, Ice::Int>& copy, const Ice::Current&)
+{
+    copy = data;
+    
+    Test::CustomMap<Ice::Long, Ice::Long> result;
+    for(Ice::Long i = 0; i < 1000; ++i)
+    {
+        result[i] = i*i;
+    }
+    return result;
+}
+
 void
 TestIntfI::shutdown(const Ice::Current& current)
 {