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, 22 insertions, 0 deletions

diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp
index 79c1ac30e31..d8624cf48ea 100644
--- a/cpp/test/Ice/custom/TestAMDI.cpp
+++ b/cpp/test/Ice/custom/TestAMDI.cpp
@@ -308,6 +308,28 @@ TestIntfI::opOutRangeByteSeq_async(const ::Test::AMD_TestIntf_opOutRangeByteSeqP
                                 ::Test::ByteSeq::const_iterator>(inS.begin(), inS.end()));
 }
 
+void 
+TestIntfI::opIntStringDict_async(const ::Test::AMD_TestIntf_opIntStringDictPtr& cb,
+                                 const ::Test::IntStringDict& inDict,
+                                 const ::Ice::Current&)
+{
+    cb->ice_response(inDict, inDict);
+}
+    
+void 
+TestIntfI::opVarDict_async(const ::Test::AMD_TestIntf_opVarDictPtr& cb,
+                                 const ::Test::CustomMap<std::string, Ice::Int>& inDict,                          
+                                 const ::Ice::Current&)
+{
+    Test::CustomMap<Ice::Long, Ice::Long> result;
+    for(Ice::Long i = 0; i < 1000; ++i)
+    {
+        result[i] = i*i;
+    }
+    cb->ice_response(result, inDict);
+}
+
+
 void
 TestIntfI::shutdown_async(const Test::AMD_TestIntf_shutdownPtr& shutdownCB,
                           const Ice::Current& current)