sm: Relocate the service manager to the System class

Rather than have it live as a global variable, place it into the System class and make it instance-based.
This commit is contained in:
Lioncash 2018-04-12 23:06:21 -04:00
parent bfd1d963ba
commit a78920e60b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
6 changed files with 69 additions and 41 deletions

View file

@ -67,7 +67,5 @@ ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ServiceManager::ConnectToSer
return client_port->Connect();
}
std::shared_ptr<ServiceManager> g_service_manager;
} // namespace SM
} // namespace Service

View file

@ -52,7 +52,5 @@ private:
std::unordered_map<std::string, Kernel::SharedPtr<Kernel::ClientPort>> registered_services;
};
extern std::shared_ptr<ServiceManager> g_service_manager;
} // namespace SM
} // namespace Service