Skip to content
This repository was archived by the owner on Nov 13, 2017. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,15 @@ struct SharedStorage

SharedStorage& getSharedStorage()
{
#if 0 // destruction of static storage interferes with static destruction in class_loader
// More specifically, class_loader's static variables might be already destroyed
// while being accessed again in the destructor of the class_loader-based kinematics plugin.
static SharedStorage storage;
return storage;
#else // thus avoid destruction at all (until class_loader is fixed)
static SharedStorage *storage = new SharedStorage;
return *storage;
#endif
}
}

Expand Down