From 4b6eee208233fc39377e9bf60b19d591fd2f2fdb Mon Sep 17 00:00:00 2001 From: Tomasz Marciniak Date: Wed, 23 Sep 2015 10:07:07 +0200 Subject: [PATCH] [Common] Removed unnecessary lock from Instance class. [Verification] Code compiles. Issue: http://168.219.209.56/jira/browse/XWALK-803 Change-Id: I37920fbdb25ee847729092aff3f37b453ec0b0dd Signed-off-by: Tomasz Marciniak --- src/common/extension.cc | 4 ---- src/common/extension.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/common/extension.cc b/src/common/extension.cc index 01872963..81926861 100755 --- a/src/common/extension.cc +++ b/src/common/extension.cc @@ -252,7 +252,6 @@ int32_t Extension::XW_Initialize(XW_Extension extension, return XW_OK; } -std::mutex Instance::instance_mutex_; std::unordered_set Instance::all_instances_; Instance::Instance() : @@ -260,7 +259,6 @@ Instance::Instance() : { LoggerD("Enter"); { - std::lock_guard lock(instance_mutex_); all_instances_.insert(this); } } @@ -268,7 +266,6 @@ Instance::Instance() : Instance::~Instance() { LoggerD("Enter"); { - std::lock_guard lock(instance_mutex_); all_instances_.erase(this); } Assert(xw_instance_ == 0); @@ -276,7 +273,6 @@ Instance::~Instance() { void Instance::PostMessage(Instance* that, const char* msg) { LoggerD("Enter"); - std::lock_guard lock(instance_mutex_); if (that && all_instances_.end() != all_instances_.find(that)) { that->PostMessage(msg); } else { diff --git a/src/common/extension.h b/src/common/extension.h index 37c39419..9fd80251 100755 --- a/src/common/extension.h +++ b/src/common/extension.h @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -125,7 +124,6 @@ class Instance { friend class Extension; - static std::mutex instance_mutex_; static std::unordered_set all_instances_; XW_Instance xw_instance_; -- 2.34.1