Revert "Speculative fix for global symbol issues for Edward"

This reverts commit b6f5b40557.

The changes did not solve the static init vector allocation issue.
This commit is contained in:
Edward d'Auvergne
2018-05-04 09:02:08 +02:00
parent b6f5b40557
commit fd4ca1c811

View File

@@ -668,9 +668,9 @@ SGSubsystemGroup::Member::update (double delta_time_sec)
namespace {
SGSubsystemMgr* global_defaultSubsystemManager = nullptr;
void registerSubsystemCommands();
} // end of anonymous namespace
SGSubsystemMgr::SGSubsystemMgr () :
@@ -912,19 +912,19 @@ namespace {
};
using SybsystemRegistrationVec = std::vector<RegisteredSubsystemData>;
SybsystemRegistrationVec global_registrations;
SybsystemRegistrationVec::const_iterator findRegistration(const std::string& name)
{
auto it = std::find_if(global_registrations.begin(),
global_registrations.end(),
[name](const RegisteredSubsystemData& d)
{ return name == d.name; });
return it;
}
} // of anonymous namespace
static SybsystemRegistrationVec global_registrations;
SybsystemRegistrationVec::const_iterator findRegistration(const std::string& name)
{
auto it = std::find_if(global_registrations.begin(),
global_registrations.end(),
[name](const RegisteredSubsystemData& d)
{ return name == d.name; });
return it;
}
void SGSubsystemMgr::registerSubsystem(const std::string& name,
SubsystemFactoryFunctor f,
GroupType group,