Skip to content

Commit 07feabb

Browse files
committed
Revert "temporary patch for race condition"
This reverts commit fe95598.
1 parent ad3ac95 commit 07feabb

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

include/ignition/gazebo/detail/EntityComponentManager.hh

-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <cstring>
2121
#include <map>
2222
#include <memory>
23-
#include <mutex>
2423
#include <optional>
2524
#include <set>
2625
#include <tuple>
@@ -487,9 +486,6 @@ void EntityComponentManager::EachRemoved(typename identity<std::function<
487486
template<typename ...ComponentTypeTs>
488487
detail::View<ComponentTypeTs...> *EntityComponentManager::FindView() const
489488
{
490-
static std::mutex mutex;
491-
std::lock_guard<std::mutex> lock(mutex);
492-
493489
auto viewKey = std::vector<ComponentTypeId>{ComponentTypeTs::typeId...};
494490

495491
auto baseViewPtr = this->FindView(viewKey);
@@ -498,7 +494,6 @@ detail::View<ComponentTypeTs...> *EntityComponentManager::FindView() const
498494
auto view = static_cast<detail::View<ComponentTypeTs...>*>(baseViewPtr);
499495

500496
// add any new entities to the view before using it
501-
view->ToAddEntities();
502497
for (const auto &[entity, isNew] : view->ToAddEntities())
503498
{
504499
view->AddEntityWithConstComps(entity, isNew,

0 commit comments

Comments
 (0)