Resolved build issue.
authorG S Senthil Kumar <senthil.gs@samsung.com>
Thu, 19 Nov 2015 09:34:38 +0000 (15:04 +0530)
committerUze Choi <uzchoi@samsung.com>
Thu, 19 Nov 2015 23:56:30 +0000 (23:56 +0000)
Issue arised from merging the following commits:
d0686ee241a3102399a7135dbe3eb2930219aab9
b76f9709482b03334b468ab47a295761b3fd6a78

Change-Id: I3053d6f995c74f3e174863c25e97d148503a3a50
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4287
Reviewed-by: Spurthi SV <spurthi.segu@samsung.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
service/simulator/src/server/simulator_collection_resource_impl.cpp

index b9fcb62..fb7f434 100755 (executable)
@@ -237,11 +237,6 @@ void SimulatorCollectionResourceImpl::setActionType(std::map<RAML::ActionType, R
     m_actionTypes = actionType;
 }
 
-void SimulatorCollectionResourceImpl::setActionType(std::map<RAML::ActionType, RAML::ActionPtr> &actionType)
-{
-    m_actionTypes = actionType;
-}
-
 std::vector<ObserverInfo> SimulatorCollectionResourceImpl::getObserversList()
 {
     return m_observersList;