From 16b8f71350c27e4d615bfe745ac720029e6fdc9c Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Mon, 12 Jun 2017 17:13:28 -0700 Subject: [PATCH] resource/src: Removing /W4 warnings. Removing variable shadowing warnings: there were a few variables using the same name in one scope and thus one overwritten the other. Bug: https://jira.iotivity.org/browse/IOT-1583 Change-Id: Ic30ecba67a98154eb506929ef23b1fabb560a42a Signed-off-by: Pawel Winogrodzki Reviewed-on: https://gerrit.iotivity.org/gerrit/20739 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- resource/src/InProcServerWrapper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resource/src/InProcServerWrapper.cpp b/resource/src/InProcServerWrapper.cpp index b8d5d40..c588b83 100644 --- a/resource/src/InProcServerWrapper.cpp +++ b/resource/src/InProcServerWrapper.cpp @@ -451,7 +451,7 @@ namespace OC } else { - std::lock_guard lock(OC::details::serverWrapperLock); + std::lock_guard mapsLock(OC::details::serverWrapperLock); OC::details::entityHandlerMap[resourceHandle] = eHandler; OC::details::resourceUriMap[resourceHandle] = resourceURI; } @@ -501,7 +501,7 @@ namespace OC if(result == OC_STACK_OK) { - std::lock_guard lock(OC::details::serverWrapperLock); + std::lock_guard resourceUriMapLock(OC::details::serverWrapperLock); OC::details::resourceUriMap.erase(resourceHandle); } else -- 2.7.4