resource/src: Removing /W4 warnings.
authorPawel Winogrodzki <pawelwi@microsoft.com>
Tue, 13 Jun 2017 00:13:28 +0000 (17:13 -0700)
committerDan Mihai <Daniel.Mihai@microsoft.com>
Thu, 15 Jun 2017 13:28:29 +0000 (13:28 +0000)
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 <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20739
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
resource/src/InProcServerWrapper.cpp

index b8d5d40..c588b83 100644 (file)
@@ -451,7 +451,7 @@ namespace OC
             }
             else
             {
-                std::lock_guard<std::mutex> lock(OC::details::serverWrapperLock);
+                std::lock_guard<std::mutex> 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<std::mutex> lock(OC::details::serverWrapperLock);
+                std::lock_guard<std::mutex> resourceUriMapLock(OC::details::serverWrapperLock);
                 OC::details::resourceUriMap.erase(resourceHandle);
             }
             else