--- a/graphicscomposition/openwfsupport/src/streammap.cpp	Tue Jun 22 15:21:29 2010 +0300
+++ b/graphicscomposition/openwfsupport/src/streammap.cpp	Tue Jul 20 13:27:44 2010 +0300
@@ -27,20 +27,6 @@
 
 static const TInt KOpenWfcInteropCleanupKey = 0x10286FC5;
 
-TEMPLATE_SPECIALIZATION class RHashTableBase::Defaults<TSurfaceId, RHashTableBase::EDefaultSpecifier_Normal>
-	{
-public:
-	inline static TGeneralHashFunction32 Hash();
-	inline static TGeneralIdentityRelation Id();
-	};
-
-inline TGeneralHashFunction32 RHashTableBase::Defaults<TSurfaceId, RHashTableBase::EDefaultSpecifier_Normal>::Hash()
-	{return (TGeneralHashFunction32)&DefaultHash::Integer;}
-
-inline TGeneralIdentityRelation RHashTableBase::Defaults<TSurfaceId, RHashTableBase::EDefaultSpecifier_Normal>::Id()
-	{return (TGeneralIdentityRelation)&DefaultIdentity::Integer;}
-
-
 COpenWfcStreamMap* COpenWfcStreamMap::pInstance = NULL;
 
 TUint32 COpenWfcStreamMap::HashFunction(const TSurfaceId& aHashKey)
@@ -66,13 +52,6 @@
 	return *pInstance;
 	}
 
-EXPORT_C TInt COpenWfcStreamMap::Reserve(TInt aExpand)
-	{
-	Guard g(iMutex);
-	TInt ret = iMap.Reserve(aExpand);
-	return ret;
-	}
-
 CSurfaceStream* COpenWfcStreamMap::Find(const TSurfaceId& aSurfaceId)
 	{
 	Guard g(iMutex);
@@ -118,7 +97,7 @@
 	return count;
 	}
 
-RSurfaceManager& COpenWfcStreamMap::SurfaceManager()
+EXPORT_C RSurfaceManager& COpenWfcStreamMap::SurfaceManager()
 	{
     WFCI_ASSERT_DEBUG(iSurfaceManager, EOwfPanicInvalidHasMap);
 	return *iSurfaceManager;
@@ -196,7 +175,7 @@
         CSurfaceStream* const* ns = NULL;
         while (nextKey)
             {
-            ns = iter.NextValue();
+            ns = iter.CurrentValue();
             if (ns && *ns)
                 {
                 delete (*ns);
@@ -220,7 +199,7 @@
         CExtensionContainer* const* extensionContainer = NULL;
         while (nextKey)
             {
-            extensionContainer = iter.NextValue();
+            extensionContainer = iter.CurrentValue();
             if (extensionContainer && *extensionContainer)
                 {
                 delete (*extensionContainer);
@@ -231,17 +210,6 @@
 	iRegisteredUpdaters.Close();
 	}
 
-COpenWfcStreamMap::COpenWfcStreamMap(const COpenWfcStreamMap&)
-	{
-	Panic(EOwfPanicInvalidCallStreamMap);
-	}
-
-COpenWfcStreamMap& COpenWfcStreamMap::operator= (const COpenWfcStreamMap&)
-	{
-	Panic(EOwfPanicInvalidCallStreamMap);
-	return *this;
-	}
-
 void COpenWfcStreamMap::ConstructL()
 	{
 	User::LeaveIfError(iMutex.CreateLocal());