diff options
| author |  Sadie Powell | 2019-02-05 00:47:30 +0000 |
|---|---|---|
| committer | Sadie Powell | 2019-02-05 00:47:30 +0000 |
| commit | bfa5fb407e13ad4adb5c062021de50ecd760ed95 (patch) | |
| tree | c573269b1a94fd7e7da27c1b90b05fa60916de23 /src/modulemanager.cpp | |
| parent | Remove support for the deprecated <power> config tag. (diff) | |
| parent | ModuleManager: use std::flush instead of fflush(stdout). (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modulemanager.cpp')
| -rw-r--r-- | src/modulemanager.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index eb40c5971..5ed7d12d5 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -66,7 +66,6 @@ bool ModuleManager::Load(const std::string& modname, bool defer) { newmod->ModuleSourceFile = filename; newmod->ModuleDLLManager = newhandle; - newmod->dying = false; Modules[filename] = newmod; std::string version = newhandle->GetVersion(); if (version.empty()) @@ -127,8 +126,7 @@ bool ModuleManager::Load(const std::string& modname, bool defer) /* We must load the modules AFTER initializing the socket engine, now */ void ModuleManager::LoadCoreModules(std::map<std::string, ServiceList>& servicemap) { - std::cout << std::endl << "Loading core commands"; - fflush(stdout); + std::cout << std::endl << "Loading core commands" << std::flush; DIR* library = opendir(ServerInstance->Config->Paths.Module.c_str()); if (library) @@ -138,8 +136,7 @@ void ModuleManager::LoadCoreModules(std::map<std::string, ServiceList>& servicem { if (InspIRCd::Match(entry->d_name, "core_*.so", ascii_case_insensitive_map)) { - std::cout << "."; - fflush(stdout); + std::cout << "." << std::flush; this->NewServices = &servicemap[entry->d_name]; |