From: Aleksandar Kanchev <kanchev@itestra.com>
Date: Thu, 6 Jun 2013 08:38:17 +0000 (+0200)
Subject: object manager: add explicit map instantiation
X-Git-Tag: 2.1-pre1~10^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=418e94cc94122509eeb73728a33a100b7698d164;p=profile%2Fivi%2Fcommon-api-dbus-runtime.git

object manager: add explicit map instantiation

fix clang compiler error by explicitly calling the DBusDaemonProxy::PropertyDictStub()
constructor, while constructing the object path and interface names dictionary.
---

diff --git a/src/CommonAPI/DBus/DBusObjectManager.cpp b/src/CommonAPI/DBus/DBusObjectManager.cpp
index 09ff9ba..6e78993 100644
--- a/src/CommonAPI/DBus/DBusObjectManager.cpp
+++ b/src/CommonAPI/DBus/DBusObjectManager.cpp
@@ -106,19 +106,20 @@ bool DBusObjectManager::onObjectManagerInterfaceDBusMessage(const DBusMessage& d
         return false;
     }
 
-    DBusDaemonProxy::DBusObjectToInterfaceDict ObjectPathsInterfacesAndPropertiesDict;
+    DBusDaemonProxy::DBusObjectToInterfaceDict resultObjectPathsInterfacesAndPropertiesDict;
 
     objectPathLock_.lock();
     auto registeredObjectsIterator = dbusRegisteredObjectsTable_.begin();
 
     while(registeredObjectsIterator != dbusRegisteredObjectsTable_.end()) {
         DBusInterfaceHandlerPath handlerPath = registeredObjectsIterator->first;
-        auto foundDictEntry = ObjectPathsInterfacesAndPropertiesDict.find(handlerPath.first);
+        auto foundDictEntry = resultObjectPathsInterfacesAndPropertiesDict.find(handlerPath.first);
 
-        if (foundDictEntry == ObjectPathsInterfacesAndPropertiesDict.end()) {
-            ObjectPathsInterfacesAndPropertiesDict.insert( { handlerPath.first, { { handlerPath.second, {} } } } );
+        if (foundDictEntry == resultObjectPathsInterfacesAndPropertiesDict.end()) {
+            resultObjectPathsInterfacesAndPropertiesDict.insert(
+            		{ handlerPath.first, { { handlerPath.second, DBusDaemonProxy::PropertyDictStub() } } } );
         } else {
-            foundDictEntry->second.insert( {handlerPath.second, {} } );
+            foundDictEntry->second.insert( {handlerPath.second, DBusDaemonProxy::PropertyDictStub() } );
         }
 
         ++registeredObjectsIterator;
@@ -129,7 +130,7 @@ bool DBusObjectManager::onObjectManagerInterfaceDBusMessage(const DBusMessage& d
     DBusMessage dbusMessageReply = dbusMessage.createMethodReturn(getManagedObjectsDBusSignature);
     DBusOutputStream outStream(dbusMessageReply);
 
-    outStream << ObjectPathsInterfacesAndPropertiesDict;
+    outStream << resultObjectPathsInterfacesAndPropertiesDict;
     outStream.flush();
 
     return dbusConnection->sendDBusMessage(dbusMessageReply);